diff options
| -rw-r--r-- | include/vcl/settings.hxx | 5 | ||||
| -rw-r--r-- | vcl/source/control/imp_listbox.cxx | 5 | ||||
| -rw-r--r-- | vcl/source/control/spinfld.cxx | 6 |
3 files changed, 3 insertions, 13 deletions
diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx index 537cb8f0c140..5fe497b8de30 100644 --- a/include/vcl/settings.hxx +++ b/include/vcl/settings.hxx @@ -186,12 +186,11 @@ enum class StyleSettingsOptions AdvancedUser = 0x0020, ScrollArrow = 0x0040, SpinArrow = 0x0080, - SpinUpDown = 0x0100, - NoMnemonics = 0x0200, + NoMnemonics = 0x0100, }; namespace o3tl { - template<> struct typed_flags<StyleSettingsOptions> : is_typed_flags<StyleSettingsOptions, 0x03ff> {}; + template<> struct typed_flags<StyleSettingsOptions> : is_typed_flags<StyleSettingsOptions, 0x01ff> {}; } enum class DragFullOptions diff --git a/vcl/source/control/imp_listbox.cxx b/vcl/source/control/imp_listbox.cxx index ed3d39cbd8fd..f1fa9a23a219 100644 --- a/vcl/source/control/imp_listbox.cxx +++ b/vcl/source/control/imp_listbox.cxx @@ -49,10 +49,7 @@ using namespace ::com::sun::star; void ImplInitDropDownButton( PushButton* pButton ) { - if ( pButton->GetSettings().GetStyleSettings().GetOptions() & StyleSettingsOptions::SpinUpDown ) - pButton->SetSymbol( SymbolType::SPIN_UPDOWN ); - else - pButton->SetSymbol( SymbolType::SPIN_DOWN ); + pButton->SetSymbol( SymbolType::SPIN_DOWN ); if ( pButton->IsNativeControlSupported(CTRL_LISTBOX, PART_ENTIRE_CONTROL) && ! pButton->IsNativeControlSupported(CTRL_LISTBOX, PART_BUTTON_DOWN) ) diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index 126152f3e704..59208e32374c 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -631,9 +631,6 @@ void SpinField::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect Rectangle aInnerRect = aView.DrawButton(maDropDownRect, nStyle); SymbolType eSymbol = SymbolType::SPIN_DOWN; - if (rRenderContext.GetSettings().GetStyleSettings().GetOptions() & StyleSettingsOptions::SpinUpDown) - eSymbol = SymbolType::SPIN_UPDOWN; - DrawSymbolFlags nSymbolStyle = IsEnabled() ? DrawSymbolFlags::NONE : DrawSymbolFlags::Disable; aView.DrawSymbol(aInnerRect, eSymbol, rRenderContext.GetSettings().GetStyleSettings().GetButtonTextColor(), nSymbolStyle); } @@ -1034,9 +1031,6 @@ void SpinField::Draw(OutputDevice* pDev, const Point& rPos, const Size& rSize, D DrawButtonFlags nStyle = DrawButtonFlags::NoLightBorder; Rectangle aInnerRect = aView.DrawButton( aDD, nStyle ); SymbolType eSymbol = SymbolType::SPIN_DOWN; - if (GetSettings().GetStyleSettings().GetOptions() & StyleSettingsOptions::SpinUpDown) - eSymbol = SymbolType::SPIN_UPDOWN; - DrawSymbolFlags nSymbolStyle = (IsEnabled() || (nFlags & DrawFlags::NoDisable)) ? DrawSymbolFlags::NONE : DrawSymbolFlags::Disable; aView.DrawSymbol(aInnerRect, eSymbol, aButtonTextColor, nSymbolStyle); } |