summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/app
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2015-05-17 22:56:46 +0900
committerTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2015-05-18 11:22:49 +0900
commitb4bbb5e5d7b31caad2fbcc00382ad27df3c81001 (patch)
tree8ac345712ff92a9b33a7d54651ed27ad88f1ec67 /dbaccess/source/ui/app
parent2ca7795a6a723c701f295323fcc3f6c52ad37976 (diff)
refactor how font, fg. and bg. are applied in widgets/controls
- Move vcl::RenderContext to outdev. - Change some methods on vcl::Window to accept RenderContext as parameter. - Add ApplySettings to vcl::Window - This method is called before painting. Refactor existing classes that use InitSettings to have ApplySettings or mark the classes to be refactored later. - Add RenderSettings for adding defered settings to rendering. This is similar to ApplySettings but for more ad-hoc calls. Change-Id: I4ea58461f3b6b08ccfa3e0ddd1a4a3e04f8c4f45
Diffstat (limited to 'dbaccess/source/ui/app')
-rw-r--r--dbaccess/source/ui/app/AppDetailPageHelper.cxx11
-rw-r--r--dbaccess/source/ui/app/AppDetailView.cxx6
-rw-r--r--dbaccess/source/ui/app/AppSwapWindow.cxx3
-rw-r--r--dbaccess/source/ui/app/AppTitleWindow.cxx3
-rw-r--r--dbaccess/source/ui/app/AppView.cxx6
5 files changed, 19 insertions, 10 deletions
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 44284fbb8f0b..c3dc8ef4a089 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -164,13 +164,14 @@ namespace
}
void OTablePreviewWindow::ImplInitSettings( bool bFont, bool bForeground, bool bBackground )
{
+ //FIXME RenderContext
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
if( bFont )
{
vcl::Font aFont;
aFont = rStyleSettings.GetFieldFont();
aFont.SetColor( rStyleSettings.GetWindowTextColor() );
- SetPointFont( aFont );
+ SetPointFont(*this, aFont);
}
if( bForeground || bFont )
@@ -1234,12 +1235,13 @@ void OAppDetailPageHelper::DataChanged( const DataChangedEvent& rDCEvt )
void OAppDetailPageHelper::ImplInitSettings()
{
+ // FIXME RenderContext
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
vcl::Font aFont;
aFont = rStyleSettings.GetFieldFont();
aFont.SetColor( rStyleSettings.GetWindowTextColor() );
- SetPointFont( aFont );
- m_aTBPreview->SetPointFont( aFont );
+ SetPointFont(*this, aFont);
+ m_aTBPreview->SetPointFont(*m_aTBPreview, aFont);
SetTextColor( rStyleSettings.GetFieldTextColor() );
SetTextFillColor();
@@ -1324,13 +1326,14 @@ void OPreviewWindow::DataChanged( const DataChangedEvent& rDCEvt )
void OPreviewWindow::ImplInitSettings( bool bFont, bool bForeground, bool bBackground )
{
+ // FIXME RenderContext
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
if( bFont )
{
vcl::Font aFont;
aFont = rStyleSettings.GetFieldFont();
aFont.SetColor( rStyleSettings.GetWindowTextColor() );
- SetPointFont( aFont );
+ SetPointFont(*this, aFont);
}
if( bForeground || bFont )
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index c547945aee5b..bd4ba2f048c0 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -391,13 +391,14 @@ void OTasksWindow::DataChanged( const DataChangedEvent& rDCEvt )
void OTasksWindow::ImplInitSettings( bool bFont, bool bForeground, bool bBackground )
{
+ // FIXME RenderContext
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
if( bFont )
{
vcl::Font aFont;
aFont = rStyleSettings.GetFieldFont();
aFont.SetColor( rStyleSettings.GetWindowTextColor() );
- SetPointFont( aFont );
+ SetPointFont(*this, aFont);
}
if( bForeground || bFont )
@@ -581,13 +582,14 @@ void OApplicationDetailView::dispose()
void OApplicationDetailView::ImplInitSettings( bool bFont, bool bForeground, bool bBackground )
{
+ // FIXME RenderContext
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
if( bFont )
{
vcl::Font aFont;
aFont = rStyleSettings.GetFieldFont();
aFont.SetColor( rStyleSettings.GetWindowTextColor() );
- SetPointFont( aFont );
+ SetPointFont(*this, aFont);
}
if( bForeground || bFont )
diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx
index 37df4725692a..05f9a06fc459 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.cxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.cxx
@@ -77,13 +77,14 @@ void OApplicationSwapWindow::Resize()
void OApplicationSwapWindow::ImplInitSettings( bool bFont, bool bForeground, bool bBackground )
{
+ // FIXME RenderContext
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
if( bFont )
{
vcl::Font aFont;
aFont = rStyleSettings.GetFieldFont();
aFont.SetColor( rStyleSettings.GetWindowTextColor() );
- SetPointFont( aFont );
+ SetPointFont(*this, aFont);
}
if( bForeground || bFont )
diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx
index 71317b01a82b..1a28fb789703 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.cxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.cxx
@@ -134,6 +134,7 @@ void OTitleWindow::DataChanged( const DataChangedEvent& rDCEvt )
void OTitleWindow::ImplInitSettings( bool bFont, bool bForeground, bool bBackground )
{
+ // FIXME RenderContext
AllSettings aAllSettings = GetSettings();
StyleSettings aStyle = aAllSettings.GetStyleSettings();
aStyle.SetMonoColor(aStyle.GetActiveBorderColor());//GetMenuBorderColor());
@@ -146,7 +147,7 @@ void OTitleWindow::ImplInitSettings( bool bFont, bool bForeground, bool bBackgro
vcl::Font aFont;
aFont = rStyleSettings.GetFieldFont();
aFont.SetColor( rStyleSettings.GetWindowTextColor() );
- SetPointFont( aFont );
+ SetPointFont(*this, aFont);
}
if( bForeground || bFont )
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index 8947c9e21c40..4c56fa87ba3f 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -150,13 +150,14 @@ void OAppBorderWindow::DataChanged( const DataChangedEvent& rDCEvt )
void OAppBorderWindow::ImplInitSettings()
{
+ // FIXME RenderContext
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
if( true )
{
vcl::Font aFont;
aFont = rStyleSettings.GetFieldFont();
aFont.SetColor( rStyleSettings.GetWindowTextColor() );
- SetPointFont( aFont );
+ SetPointFont(*this, aFont);
}
if( true )
@@ -548,13 +549,14 @@ void OApplicationView::_disposing( const ::com::sun::star::lang::EventObject& /*
void OApplicationView::ImplInitSettings()
{
+ // FIXME RenderContext
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
if( true )
{
vcl::Font aFont;
aFont = rStyleSettings.GetFieldFont();
aFont.SetColor( rStyleSettings.GetWindowTextColor() );
- SetPointFont( aFont );
+ SetPointFont(*this, aFont);
}
if( true )