diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-06-09 14:06:10 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-06-09 14:41:18 +0100 |
| commit | 753fa7ca2fbeb6dfc3f014a68c7d48c6e227be34 (patch) | |
| tree | 3ab1a6947e5bba43f539dc776771d0aba55ccc2b /vcl | |
| parent | eacbead4f5a4dc7c8db3d60c948e28c199aa2b10 (diff) | |
tdf#91462 MenuBarHighlightTextColor should default to MenuHighlightTextColor
Change-Id: I17607b0040f8adc2f0cbbe98a1d3a9af7b19c816
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/app/settings.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/menu.cxx | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 0d324464cf9c..b8572e347bb0 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -738,7 +738,7 @@ void ImplStyleData::SetStandardStyles() maMenuTextColor = Color( COL_BLACK ); maMenuBarTextColor = Color( COL_BLACK ); maMenuBarRolloverTextColor = Color( COL_WHITE ); - maMenuBarHighlightTextColor = Color( COL_BLUE ); + maMenuBarHighlightTextColor = Color( COL_WHITE ); maMenuHighlightColor = Color( COL_BLUE ); maMenuHighlightTextColor = Color( COL_WHITE ); maHighlightColor = Color( COL_BLUE ); diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 703c7a1f8616..34c485de80c5 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -1843,12 +1843,7 @@ void Menu::ImplPaint(vcl::RenderContext& rRenderContext, if (bRollover) rRenderContext.SetTextColor(rSettings.GetMenuBarRolloverTextColor()); else if (bHighlighted) - { - if ( rSettings.GetMenuHighlightColor().AsRGBHexString() != rSettings.GetMenuBarHighlightTextColor().AsRGBHexString() ) - rRenderContext.SetTextColor(rSettings.GetMenuBarHighlightTextColor()); - else - rRenderContext.SetTextColor(rSettings.GetMenuBarRolloverTextColor()); - } + rRenderContext.SetTextColor(rSettings.GetMenuBarHighlightTextColor()); } else { |