diff options
| -rw-r--r-- | include/vcl/settings.hxx | 10 | ||||
| -rw-r--r-- | vcl/source/control/scrbar.cxx | 32 |
2 files changed, 8 insertions, 34 deletions
diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx index 72283aa0fc77..acbacf3346d0 100644 --- a/include/vcl/settings.hxx +++ b/include/vcl/settings.hxx @@ -179,17 +179,11 @@ enum class StyleSettingsOptions { NONE = 0x0000, Mono = 0x0001, - Color = 0x0002, - Flat = 0x0004, - Great = 0x0008, - Highlight = 0x0010, - AdvancedUser = 0x0020, - ScrollArrow = 0x0040, - NoMnemonics = 0x0080, + NoMnemonics = 0x0002, }; namespace o3tl { - template<> struct typed_flags<StyleSettingsOptions> : is_typed_flags<StyleSettingsOptions, 0x00ff> {}; + template<> struct typed_flags<StyleSettingsOptions> : is_typed_flags<StyleSettingsOptions, 0x0003> {}; } enum class DragFullOptions diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index 485d613afabd..40b6161dd29c 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -642,20 +642,10 @@ void ScrollBar::ImplDraw(vcl::RenderContext& rRenderContext, sal_uInt16 nDrawFla DrawSymbolFlags nSymbolStyle = DrawSymbolFlags::NONE; if ((mnStateFlags & SCRBAR_STATE_BTN1_DISABLE) || !bEnabled) nSymbolStyle |= DrawSymbolFlags::Disable; - if (rStyleSettings.GetOptions() & StyleSettingsOptions::ScrollArrow) - { - if (GetStyle() & WB_HORZ) - eSymbolType = SymbolType::ARROW_LEFT; - else - eSymbolType = SymbolType::ARROW_UP; - } + if (GetStyle() & WB_HORZ) + eSymbolType = SymbolType::SPIN_LEFT; else - { - if (GetStyle() & WB_HORZ) - eSymbolType = SymbolType::SPIN_LEFT; - else - eSymbolType = SymbolType::SPIN_UP; - } + eSymbolType = SymbolType::SPIN_UP; aDecoView.DrawSymbol(aTempRect, eSymbolType, rStyleSettings.GetButtonTextColor(), nSymbolStyle); } @@ -669,20 +659,10 @@ void ScrollBar::ImplDraw(vcl::RenderContext& rRenderContext, sal_uInt16 nDrawFla DrawSymbolFlags nSymbolStyle = DrawSymbolFlags::NONE; if ((mnStateFlags & SCRBAR_STATE_BTN2_DISABLE) || !bEnabled) nSymbolStyle |= DrawSymbolFlags::Disable; - if (rStyleSettings.GetOptions() & StyleSettingsOptions::ScrollArrow) - { - if (GetStyle() & WB_HORZ) - eSymbolType = SymbolType::ARROW_RIGHT; - else - eSymbolType = SymbolType::ARROW_DOWN; - } + if (GetStyle() & WB_HORZ) + eSymbolType = SymbolType::SPIN_RIGHT; else - { - if (GetStyle() & WB_HORZ) - eSymbolType = SymbolType::SPIN_RIGHT; - else - eSymbolType = SymbolType::SPIN_DOWN; - } + eSymbolType = SymbolType::SPIN_DOWN; aDecoView.DrawSymbol(aTempRect, eSymbolType, rStyleSettings.GetButtonTextColor(), nSymbolStyle); } |