vcl/unx/gtk3/custom-theme.cxx | 74 ------------------------------------------
vcl/unx/gtk3/custom-theme.hxx | 1
2 files changed, 75 deletions(-)
New commits:
commit f70f5fad59e55abd15209128d7f14b3015e2958b
Author: Sahil Gautam <sahil.gautam.ext...@allotropia.de>
AuthorDate: Fri Feb 21 19:58:31 2025 +0530
Commit: Sahil Gautam <sahil.gautam.ext...@allotropia.de>
CommitDate: Fri Feb 21 17:00:00 2025 +0100
remove unused LoadColorsFromTheme() from gtk theming code
the usual theming approach is to set the colors at the source i.e.
using the widget toolkit's mechanism and then the UpdateSettings
function should be able to extract that color and set it in the
StyleSettings.
LoadColorsFromTheme like functions are used where the widget toolkit
doesn't provide a nice way of setting the colors at source.
Change-Id: I235f4dc06d9f8607cad6bfcdafae66f597f10547
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182003
Reviewed-by: Sahil Gautam <sahil.gautam.ext...@allotropia.de>
Tested-by: Jenkins
diff --git a/vcl/unx/gtk3/custom-theme.cxx b/vcl/unx/gtk3/custom-theme.cxx
index b22bb0fe4439..9f5b8500c3b9 100644
--- a/vcl/unx/gtk3/custom-theme.cxx
+++ b/vcl/unx/gtk3/custom-theme.cxx
@@ -15,80 +15,6 @@
namespace CustomTheme
{
-void LoadColorsFromTheme(StyleSettings& rStyleSet)
-{
- const ThemeColors& aThemeColors = ThemeColors::GetThemeColors();
-
- rStyleSet.SetDialogTextColor(aThemeColors.GetWindowColor());
-
rStyleSet.SetDefaultActionButtonTextColor(aThemeColors.GetWindowTextColor());
- rStyleSet.SetActionButtonTextColor(aThemeColors.GetButtonTextColor());
- rStyleSet.SetListBoxWindowTextColor(aThemeColors.GetBaseColor());
- rStyleSet.SetRadioCheckTextColor(aThemeColors.GetWindowTextColor());
- rStyleSet.SetGroupTextColor(aThemeColors.GetWindowTextColor());
- rStyleSet.SetLabelTextColor(aThemeColors.GetWindowTextColor());
- rStyleSet.SetWindowTextColor(aThemeColors.GetWindowTextColor());
- rStyleSet.SetFieldTextColor(aThemeColors.GetWindowTextColor());
- rStyleSet.SetShadowColor(aThemeColors.GetShadeColor());
-
- rStyleSet.BatchSetBackgrounds(aThemeColors.GetBaseColor());
- rStyleSet.SetDefaultButtonTextColor(aThemeColors.GetButtonTextColor());
-
rStyleSet.SetDefaultButtonRolloverTextColor(aThemeColors.GetButtonTextColor());
-
rStyleSet.SetDefaultButtonPressedRolloverTextColor(aThemeColors.GetFaceColor());
- rStyleSet.SetButtonRolloverTextColor(aThemeColors.GetButtonTextColor());
-
rStyleSet.SetDefaultActionButtonRolloverTextColor(aThemeColors.GetFaceColor());
-
rStyleSet.SetDefaultActionButtonPressedRolloverTextColor(aThemeColors.GetFaceColor());
- rStyleSet.SetActionButtonRolloverTextColor(aThemeColors.GetFaceColor());
-
rStyleSet.SetActionButtonPressedRolloverTextColor(aThemeColors.GetFaceColor());
- rStyleSet.SetFlatButtonTextColor(aThemeColors.GetFaceColor());
-
rStyleSet.SetFlatButtonPressedRolloverTextColor(aThemeColors.GetFaceColor());
- rStyleSet.SetFlatButtonRolloverTextColor(aThemeColors.GetFaceColor());
- rStyleSet.SetFieldRolloverTextColor(aThemeColors.GetFaceColor());
-
- // Some colors like ButtonRolloverTextColor are present in the
StyleSettings but
- // not in ThemeColors, hence cannot be customized yet. These will be added
to
- // ThemeColors as the themeing system evolves. Leaving as commented for
now.
-
- // rStyleSet.SetButtonRolloverTextColor(Color(0));
- // rStyleSet.SetButtonPressedRolloverTextColor(Color(0));
- // rStyleSet.SetHelpColor(Color(0));
- // rStyleSet.SetHelpTextColor(Color(0));
-
- rStyleSet.SetAccentColor(aThemeColors.GetAccentColor());
- rStyleSet.SetHighlightColor(aThemeColors.GetAccentColor());
- rStyleSet.SetHighlightTextColor(aThemeColors.GetActiveTextColor());
- rStyleSet.SetListBoxWindowHighlightColor(aThemeColors.GetActiveColor());
-
rStyleSet.SetListBoxWindowHighlightTextColor(aThemeColors.GetActiveTextColor());
- rStyleSet.SetActiveColor(aThemeColors.GetActiveColor());
- rStyleSet.SetActiveTextColor(aThemeColors.GetActiveTextColor());
-
- rStyleSet.SetFieldColor(aThemeColors.GetFieldColor());
-
- rStyleSet.SetWindowColor(aThemeColors.GetWindowColor());
- rStyleSet.SetListBoxWindowBackgroundColor(aThemeColors.GetWindowColor());
-
- rStyleSet.SetActiveTabColor(aThemeColors.GetActiveColor());
- rStyleSet.SetInactiveTabColor(aThemeColors.GetInactiveColor());
-
- rStyleSet.SetMenuColor(aThemeColors.GetMenuColor());
- rStyleSet.SetMenuBarColor(aThemeColors.GetMenuBarColor());
- rStyleSet.SetMenuBarRolloverColor(aThemeColors.GetMenuBarHighlightColor());
- rStyleSet.SetMenuBarTextColor(aThemeColors.GetMenuBarTextColor());
-
rStyleSet.SetMenuBarRolloverTextColor(aThemeColors.GetMenuBarHighlightTextColor());
-
rStyleSet.SetMenuBarHighlightTextColor(aThemeColors.GetMenuHighlightTextColor());
- rStyleSet.SetMenuTextColor(aThemeColors.GetMenuTextColor());
- rStyleSet.SetMenuHighlightColor(aThemeColors.GetMenuHighlightColor());
-
rStyleSet.SetMenuHighlightTextColor(aThemeColors.GetMenuHighlightTextColor());
-
- rStyleSet.SetLinkColor(aThemeColors.GetActiveColor());
-
- Color aVisitedLinkColor = aThemeColors.GetActiveColor();
- aVisitedLinkColor.Merge(aThemeColors.GetWindowColor(), 100);
- rStyleSet.SetVisitedLinkColor(aVisitedLinkColor);
- rStyleSet.SetTabTextColor(aThemeColors.GetMenuBarTextColor());
- rStyleSet.SetToolTextColor(aThemeColors.GetWindowTextColor());
-
rStyleSet.SetTabRolloverTextColor(aThemeColors.GetMenuBarHighlightTextColor());
-}
-
#if GTK_CHECK_VERSION(4, 0, 0)
void ApplyCustomTheme(GdkDisplay* pGdkDisplay, GtkCssProvider**
pCustomThemeProvider)
#else
diff --git a/vcl/unx/gtk3/custom-theme.hxx b/vcl/unx/gtk3/custom-theme.hxx
index 9ab41bf2a8a4..9d1574416569 100644
--- a/vcl/unx/gtk3/custom-theme.hxx
+++ b/vcl/unx/gtk3/custom-theme.hxx
@@ -21,5 +21,4 @@ void ApplyCustomTheme(GdkScreen* pScreen, GtkCssProvider**
pCustomThemeProvider)
#endif
OString CreateStyleString();
-void LoadColorsFromTheme(StyleSettings& rStyleSet);
}
