diff options
author | Michael Meeks <michael.meeks@collabora.com> | 2017-11-10 17:57:19 +0000 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2017-11-11 16:56:33 +0100 |
commit | b77af2396adbab0ec4fea4160e0c711b080fff67 (patch) | |
tree | 92278cb7d916dce44b658888be7f43a8b0c33658 /vcl/unx | |
parent | 5bd7cc788d0b0f4a2595f32f4897abe6e39ce6c8 (diff) |
vcl: StyleSettings - start to unwind code duplication.
This should be a pure re-factor, plus headless tweak.
Change-Id: Iad7f524ea76625601b3f85cc13a50311ed1de171
Reviewed-on: https://gerrit.libreoffice.org/44624
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'vcl/unx')
-rw-r--r-- | vcl/unx/gtk/salnativewidgets-gtk.cxx | 7 | ||||
-rw-r--r-- | vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx | 6 | ||||
-rw-r--r-- | vcl/unx/kde4/KDESalFrame.cxx | 11 | ||||
-rw-r--r-- | vcl/unx/kde5/KDE5SalFrame.cxx | 11 |
4 files changed, 11 insertions, 24 deletions
diff --git a/vcl/unx/gtk/salnativewidgets-gtk.cxx b/vcl/unx/gtk/salnativewidgets-gtk.cxx index 5126034ed5e5..2973feaa2a54 100644 --- a/vcl/unx/gtk/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/salnativewidgets-gtk.cxx @@ -3826,13 +3826,10 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) // background colors Color aBackColor = getColor( pStyle->bg[GTK_STATE_NORMAL] ); Color aBackFieldColor = getColor( pStyle->base[GTK_STATE_NORMAL] ); - aStyleSet.Set3DColors( aBackColor ); - aStyleSet.SetFaceColor( aBackColor ); - aStyleSet.SetDialogColor( aBackColor ); - aStyleSet.SetWorkspaceColor( aBackColor ); + aStyleSet.BatchSetBackgrounds( aBackColor ); + aStyleSet.SetFieldColor( aBackFieldColor ); aStyleSet.SetWindowColor( aBackFieldColor ); - aStyleSet.SetCheckedColorSpecialCase( ); // Dark shadow color Color aDarkShadowColor = getColor( pStyle->fg[GTK_STATE_INSENSITIVE] ); diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx index 678bf4efdf90..9229b4e178dc 100644 --- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx @@ -2878,11 +2878,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) gtk_style_context_get_background_color(pStyle, gtk_style_context_get_state(pStyle), &background_color); ::Color aBackColor = getColor( background_color ); - aStyleSet.Set3DColors( aBackColor ); - aStyleSet.SetFaceColor( aBackColor ); - aStyleSet.SetDialogColor( aBackColor ); - aStyleSet.SetWorkspaceColor( aBackColor ); - aStyleSet.SetCheckedColorSpecialCase( ); + aStyleSet.BatchSetBackgrounds( aBackColor ); // UI font vcl::Font aFont(getFont(pStyle, rSettings.GetUILanguageTag().getLocale())); diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx index 97f0fabf4c62..ea46d6e5c247 100644 --- a/vcl/unx/kde4/KDESalFrame.cxx +++ b/vcl/unx/kde4/KDESalFrame.cxx @@ -254,15 +254,12 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings ) // Disable color style.SetDisableColor( toColor( pal.color( QPalette::Disabled, QPalette::WindowText ) ) ); - // Workspace - style.SetWorkspaceColor( aMid ); - // Background - style.Set3DColors( aBack ); - style.SetFaceColor( aBack ); + style.BatchSetBackgrounds( aBack ); style.SetInactiveTabColor( aBack ); - style.SetDialogColor( aBack ); - style.SetCheckedColorSpecialCase( ); + + // Workspace + style.SetWorkspaceColor( aMid ); // Selection style.SetHighlightColor( aHigh ); diff --git a/vcl/unx/kde5/KDE5SalFrame.cxx b/vcl/unx/kde5/KDE5SalFrame.cxx index 5a15b6fb2592..1222260702ef 100644 --- a/vcl/unx/kde5/KDE5SalFrame.cxx +++ b/vcl/unx/kde5/KDE5SalFrame.cxx @@ -240,15 +240,12 @@ void KDE5SalFrame::UpdateSettings( AllSettings& rSettings ) // Disable color style.SetDisableColor( toColor( pal.color( QPalette::Disabled, QPalette::WindowText ) ) ); - // Workspace - style.SetWorkspaceColor( aMid ); - // Background - style.Set3DColors( aBack ); - style.SetFaceColor( aBack ); + style.BatchSetBackgrounds( aBack ); style.SetInactiveTabColor( aBack ); - style.SetDialogColor( aBack ); - style.SetCheckedColorSpecialCase( ); + + // Workspace + style.SetWorkspaceColor( aMid ); // Selection style.SetHighlightColor( aHigh ); |