User: kz Date: 06/01/03 08:16:32 Modified: /dba/dbaccess/source/ui/app/ AppSwapWindow.cxx
Log: INTEGRATION: CWS dba202c (1.6.50); FILE MERGED 2005/12/05 10:20:07 oj 1.6.50.2: #i52615# system color 2005/12/01 13:23:21 oj 1.6.50.1: #i52615# datachanged overload File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppSwapWindow.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppSwapWindow.cxx?r1=1.6&r2=1.7 Delta lines: +9 -11 -------------------- --- AppSwapWindow.cxx 23 Sep 2005 12:17:08 -0000 1.6 +++ AppSwapWindow.cxx 3 Jan 2006 16:16:29 -0000 1.7 @@ -116,24 +116,22 @@ void OApplicationSwapWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); - - if ( bFont ) + if( bFont ) { - Font aFont = rStyleSettings.GetAppFont(); - if ( IsControlFont() ) - aFont.Merge( GetControlFont() ); + Font aFont; + aFont = rStyleSettings.GetFieldFont(); + aFont.SetColor( rStyleSettings.GetWindowTextColor() ); SetPointFont( aFont ); } - if ( bFont || bForeground ) + if( bForeground || bFont ) { - Color aTextColor = rStyleSettings.GetButtonTextColor(); - if ( IsControlForeground() ) - aTextColor = GetControlForeground(); - SetTextColor( aTextColor ); + SetTextColor( rStyleSettings.GetFieldTextColor() ); + SetTextFillColor(); } - SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetWindowColor() ) ); + if( bBackground ) + SetBackground( rStyleSettings.GetFieldColor() ); } // ----------------------------------------------------------------------- void OApplicationSwapWindow::DataChanged( const DataChangedEvent& rDCEvt ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
