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/window/salframe.cxx | |
| 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/window/salframe.cxx')
| -rw-r--r-- | vcl/win/source/window/salframe.cxx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index fa664cb948f1..1aa874331fb3 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -2828,8 +2828,16 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings ) aStyleSettings.SetUseFlatBorders( FALSE ); aStyleSettings.SetUseFlatMenus( FALSE ); aStyleSettings.SetMenuTextColor( ImplWinColorToSal( GetSysColor( COLOR_MENUTEXT ) ) ); - aStyleSettings.SetMenuBarTextColor( ImplWinColorToSal( GetSysColor( COLOR_MENUTEXT ) ) ); - aStyleSettings.SetMenuBarRolloverTextColor( ImplWinColorToSal( GetSysColor( COLOR_HIGHLIGHTTEXT ) ) ); + if ( boost::optional<Color> aColor = aStyleSettings.GetPersonaMenuBarTextColor() ) + { + aStyleSettings.SetMenuBarTextColor( *aColor ); + aStyleSettings.SetMenuBarRolloverTextColor( *aColor ); + } + else + { + aStyleSettings.SetMenuBarTextColor( ImplWinColorToSal( GetSysColor( COLOR_MENUTEXT ) ) ); + aStyleSettings.SetMenuBarRolloverTextColor( ImplWinColorToSal( GetSysColor( COLOR_HIGHLIGHTTEXT ) ) ); + } aStyleSettings.SetActiveColor( ImplWinColorToSal( GetSysColor( COLOR_ACTIVECAPTION ) ) ); aStyleSettings.SetActiveTextColor( ImplWinColorToSal( GetSysColor( COLOR_CAPTIONTEXT ) ) ); aStyleSettings.SetDeactiveColor( ImplWinColorToSal( GetSysColor( COLOR_INACTIVECAPTION ) ) ); |