Skip to content

C
core
Kaydet (Commit) 753fa7ca authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

tdf#91462 MenuBarHighlightTextColor should default to MenuHighlightTextColor 

Change-Id: I17607b0040f8adc2f0cbbe98a1d3a9af7b19c816
üst eacbead4
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 7 deletions
vcl/source/app/settings.cxx
Dosyayı görüntüle @ 753fa7ca
......@@ -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 );
......
vcl/source/window/menu.cxx
Dosyayı görüntüle @ 753fa7ca
......@@ -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
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment