diff options
| author | Cao Cuong Ngo <cao.cuong.ngo@gmail.com> | 2013-03-30 19:30:07 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2013-04-04 11:25:54 +0000 |
| commit | 84e99bd79ab4fef7e91bd302d1426cf1b3653b7f (patch) | |
| tree | e206de2a97e5cf1cbf539443bd8c0d8642d94817 /vcl | |
| parent | c3ffd741b207774be787896dfd305db89aca0e42 (diff) | |
fdo#60542 Persona setting: change color of the text menu.
Change-Id: I1d0ed94d41b3b8bcf0504e1528f4f505f817ad86
Reviewed-on: https://gerrit.libreoffice.org/3127
Reviewed-by: Jan Holesovsky <kendy@suse.cz>
Tested-by: Jan Holesovsky <kendy@suse.cz>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/app/settings.cxx | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index d8b1ce5807c8..a23748857f7b 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -702,7 +702,7 @@ static BitmapEx readBitmapEx( const OUString& rPath ) enum WhichPersona { PERSONA_HEADER, PERSONA_FOOTER }; /** Update the setting of the Persona header / footer in ImplStyleData */ -static void setupPersonaHeaderFooter( WhichPersona eWhich, OUString& rHeaderFooter, BitmapEx& rHeaderFooterBitmap ) +static void setupPersonaHeaderFooter( WhichPersona eWhich, OUString& rHeaderFooter, BitmapEx& rHeaderFooterBitmap, Color& maMenuBarTextColor ) { uno::Reference< uno::XComponentContext > xContext( comphelper::getProcessComponentContext() ); if ( !xContext.is() ) @@ -721,13 +721,20 @@ static void setupPersonaHeaderFooter( WhichPersona eWhich, OUString& rHeaderFoot rHeaderFooterBitmap = BitmapEx(); // now read the new values and setup bitmaps - OUString aHeader, aFooter; + OUString aHeader, aFooter, aColor; if ( aPersona == "own" ) { sal_Int32 nIndex = 0; aHeader = aPersonaSettings.getToken( 0, ';', nIndex ); if ( nIndex > 0 ) aFooter = aPersonaSettings.getToken( 0, ';', nIndex ); + + // change menu text color, advance nIndex to skip the '#' + if ( nIndex > 0 ) + { + aColor = aPersonaSettings.getToken( 0, ';', ++nIndex ); + maMenuBarTextColor = Color( aColor.toInt64( 16 ) ); + } } else if ( aPersona == "default" ) { @@ -762,7 +769,7 @@ static void setupPersonaHeaderFooter( WhichPersona eWhich, OUString& rHeaderFoot const BitmapEx StyleSettings::GetPersonaHeader() const { - setupPersonaHeaderFooter( PERSONA_HEADER, mpData->maPersonaHeaderFooter, mpData->maPersonaHeaderBitmap ); + setupPersonaHeaderFooter( PERSONA_HEADER, mpData->maPersonaHeaderFooter, mpData->maPersonaHeaderBitmap, mpData->maMenuBarTextColor ); return mpData->maPersonaHeaderBitmap; } |