diff options
| author | Isamu Mogi <saturday6c@gmail.com> | 2014-03-22 11:51:08 +0900 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-03-28 11:38:55 +0000 |
| commit | 42877b3478074e64d14bf8ffc3b31cb3a2a86d87 (patch) | |
| tree | b0b2f21e373c6810e5044a5a82f14a283260fe48 /vcl/win/source/gdi | |
| parent | 26355306ffaae4ec85a0ddaa372d93526781ac6a (diff) | |
fdo#68546 Make menubar's text color of persona the same as Firefox
Change-Id: Ib9370f4b369f2baf29d118a1bbcd565bca005c30
Reviewed-on: https://gerrit.libreoffice.org/8712
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/win/source/gdi')
| -rw-r--r-- | vcl/win/source/gdi/salnativewidgets-luna.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
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; } |