mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#41440, fdo#50296: start center: force black text color

Browse Source 
Change-Id: I13834d3c0385e1a75d2d66d1622a966c66b9aab2
This commit is contained in:
Ivan Timofeev
2012-09-20 21:28:25 +04:00
parent b40f95f915
commit 1b034ebe04
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
framework/source/services/backingwindow.cxx
View File

@@ -405,14 +405,22 @@ void BackingWindow::prepareRecentFileMenu()
maOpenButton.SetPopupMenu( mpRecentMenu );
}
namespace
{
static void lcl_SetBlackButtonTextColor( PushButton& rButton )
{
AllSettings aSettings = rButton.GetSettings();
StyleSettings aStyleSettings = aSettings.GetStyleSettings();
aStyleSettings.SetButtonTextColor( Color(COL_BLACK) );
aSettings.SetStyleSettings( aStyleSettings );
rButton.SetSettings( aSettings );
}
}
void BackingWindow::initBackground()
{
SetBackground();
bool bDark = GetSettings().GetStyleSettings().GetHighContrastMode();
Color aTextBGColor( bDark ? COL_BLACK : COL_WHITE );
// select image set
ImageContainerRes aRes( FwkResId( RES_BACKING_IMAGES ) );
@@ -456,6 +464,16 @@ void BackingWindow::initBackground()
maOpenButton.SetMenuMode( MENUBUTTON_MENUMODE_TIMED );
maOpenButton.SetSelectHdl( LINK( this, BackingWindow, SelectHdl ) );
maOpenButton.SetActivateHdl( LINK( this, BackingWindow, ActivateHdl ) );
// fdo#41440: force black text color, since the background image is white.
lcl_SetBlackButtonTextColor( maWriterButton );
lcl_SetBlackButtonTextColor( maCalcButton );
lcl_SetBlackButtonTextColor( maImpressButton );
lcl_SetBlackButtonTextColor( maOpenButton );
lcl_SetBlackButtonTextColor( maDrawButton );
lcl_SetBlackButtonTextColor( maDBButton );
lcl_SetBlackButtonTextColor( maMathButton );
lcl_SetBlackButtonTextColor( maTemplateButton );
}
void BackingWindow::initControls()