Tag: cws_src680_dba202d User: fs Date: 06/01/24 02:02:42 Modified: /dba/dbaccess/source/ui/app/ AppSwapWindow.cxx
Log: RESYNC: (1.6-1.7); FILE MERGED 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.52.1&r2=1.6.52.2 Delta lines: +12 -14 --------------------- --- AppSwapWindow.cxx 23 Jan 2006 11:47:06 -0000 1.6.52.1 +++ AppSwapWindow.cxx 24 Jan 2006 10:02:39 -0000 1.6.52.2 @@ -117,24 +117,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]
