[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - vcl/unx

[Michael Weghorn (via logerrit)]

 vcl/unx/gtk3/salnativewidgets-gtk.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 2103178720fd485651b94b7819ea33ec602c3b79
Author:     Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Fri Sep 16 10:30:01 2022 +0200
Commit:     Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Sat Sep 17 05:10:19 2022 +0200

    tdf#137341 gtk: Set missing style text colors from theme
    
        commit 8d11b953c0a69f4f5eb5ca42dec3812a62d0cd0f
        Date:   Sun Feb 23 21:11:05 2020 +0100
    
            tdf#125532: White text on default/action buttons and selected tabs 
on macOS
    
    had introduced various new text colors to the style
    settings, but some were not set from the theme for gtk.
    
    Add the missing ones.
    
    Change-Id: I1bd7ce358626b3f4ff1d6f2794d5c0f19f78a668
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140058
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
    (cherry picked from commit 8306152d5205dd35c118d06368f6c77254f87518)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139984
    Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/vcl/unx/gtk3/salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/salnativewidgets-gtk.cxx
index 3eaffc903e16..64f6357abd79 100644
--- a/vcl/unx/gtk3/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/salnativewidgets-gtk.cxx
@@ -2337,10 +2337,16 @@ bool GtkSalGraphics::updateSettings(AllSettings& 
rSettings)
     style_context_set_state(pStyle, GTK_STATE_FLAG_PRELIGHT);
     style_context_get_color(pStyle, &text_color);
     aTextColor = getColor(text_color);
+    aStyleSet.SetDefaultButtonTextColor(aTextColor);
     aStyleSet.SetDefaultButtonRolloverTextColor(aTextColor);
+    aStyleSet.SetDefaultButtonPressedRolloverTextColor(aTextColor);
     aStyleSet.SetButtonRolloverTextColor(aTextColor);
     aStyleSet.SetDefaultActionButtonRolloverTextColor(aTextColor);
+    aStyleSet.SetDefaultActionButtonPressedRolloverTextColor(aTextColor);
     aStyleSet.SetActionButtonRolloverTextColor(aTextColor);
+    aStyleSet.SetActionButtonPressedRolloverTextColor(aTextColor);
+    aStyleSet.SetFlatButtonTextColor(aTextColor);
+    aStyleSet.SetFlatButtonPressedRolloverTextColor(aTextColor);
     aStyleSet.SetFlatButtonRolloverTextColor(aTextColor);
     aStyleSet.SetFieldRolloverTextColor(aTextColor);