Tag: cws_src680_oj14 User: oj Date: 06/03/20 05:54:42 Modified: /dba/dbaccess/source/ui/app/ AppView.cxx
Log: RESYNC: (1.11-1.12); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppView.cxx?r1=1.11.4.1&r2=1.11.4.2 Delta lines: +42 -7 -------------------- --- AppView.cxx 3 Jan 2006 07:48:59 -0000 1.11.4.1 +++ AppView.cxx 20 Mar 2006 13:54:36 -0000 1.11.4.2 @@ -228,9 +228,27 @@ // ----------------------------------------------------------------------------- void OAppBorderWindow::ImplInitSettings() { - SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetDialogColor() ) ); + const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); + if( true ) + { + Font aFont; + aFont = rStyleSettings.GetFieldFont(); + aFont.SetColor( rStyleSettings.GetWindowTextColor() ); + SetPointFont( aFont ); + } + + if( true ) + { + SetTextColor( rStyleSettings.GetFieldTextColor() ); + SetTextFillColor(); + } + + if( true ) + SetBackground( rStyleSettings.GetDialogColor() ); + + /*SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetDialogColor() ) ); SetFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() ); - SetTextFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() ); + SetTextFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() );*/ } // ----------------------------------------------------------------------------- OApplicationView* OAppBorderWindow::getView() const { return m_pView; } @@ -616,8 +634,25 @@ // ----------------------------------------------------------------------------- void OApplicationView::ImplInitSettings() { - SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetDialogColor() ) ); + const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); + if( true ) + { + Font aFont; + aFont = rStyleSettings.GetFieldFont(); + aFont.SetColor( rStyleSettings.GetWindowTextColor() ); + SetPointFont( aFont ); + } + + if( true ) + { + SetTextColor( rStyleSettings.GetFieldTextColor() ); + SetTextFillColor(); + } + + if( true ) + SetBackground( rStyleSettings.GetFieldColor() ); + /*SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetDialogColor() ) ); SetFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() ); - SetTextFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() ); + SetTextFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() );*/ } //----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
