From 42877b3478074e64d14bf8ffc3b31cb3a2a86d87 Mon Sep 17 00:00:00 2001 From: Isamu Mogi Date: Sat, 22 Mar 2014 11:51:08 +0900 Subject: fdo#68546 Make menubar's text color of persona the same as Firefox MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ib9370f4b369f2baf29d118a1bbcd565bca005c30 Reviewed-on: https://gerrit.libreoffice.org/8712 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- vcl/win/source/gdi/salnativewidgets-luna.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'vcl/win/source/gdi') diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx index 67326b05afeb..45d6c5997987 100644 --- a/vcl/win/source/gdi/salnativewidgets-luna.cxx +++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx @@ -1517,12 +1517,13 @@ void WinSalGraphics::updateSettingsNative( AllSettings& rSettings ) // FIXME get the color directly from the theme, not from the settings if( aSalShlData.maVersionInfo.dwMajorVersion >= 6 ) { + Color aMenuBarTextColor = aStyleSettings.GetPersonaMenuBarTextColor().get_value_or( aStyleSettings.GetMenuTextColor() ); // in aero menuitem highlight text is drawn in the same color as normal aStyleSettings.SetMenuHighlightTextColor( aStyleSettings.GetMenuTextColor() ); - aStyleSettings.SetMenuBarRolloverTextColor( aStyleSettings.GetMenuTextColor() ); + aStyleSettings.SetMenuBarRolloverTextColor( aMenuBarTextColor ); pSVData->maNWFData.mnMenuFormatBorderX = 2; pSVData->maNWFData.mnMenuFormatBorderY = 2; - pSVData->maNWFData.maMenuBarHighlightTextColor = aStyleSettings.GetMenuTextColor(); + pSVData->maNWFData.maMenuBarHighlightTextColor = aMenuBarTextColor; GetSalData()->mbThemeMenuSupport = TRUE; } -- cgit