[Libreoffice-commits] core.git: vcl/unx

[Caolán McNamara (via logerrit)]

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

New commits:
commit c76ed7c97f73e7d82ec337a0bc8b840346670a80
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Sep 15 12:11:07 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Sep 15 18:18:11 2021 +0200

    gtk4: remove text-button css property on setting a child image widget
    
    I suspect this happens automatically > 4.2.1
    
    Change-Id: I1b752ee5cec00005fe0f552548f38eab40249087
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122144
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index afcad3c4de7b..bdf14df96d98 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -10966,6 +10966,8 @@ private:
         gtk_tool_button_set_icon_widget(pItem, pImage);
 #else
         gtk_button_set_child(pItem, pImage);
+        // versions of gtk4 > 4.2.1 might do this on their own
+        gtk_widget_remove_css_class(GTK_WIDGET(pItem), "text-button");
 #endif
     }
 
@@ -10987,6 +10989,8 @@ private:
         gtk_tool_button_set_icon_widget(pItem, pImage);
 #else
         gtk_button_set_child(pItem, pImage);
+        // versions of gtk4 > 4.2.1 might do this on their own
+        gtk_widget_remove_css_class(GTK_WIDGET(pItem), "text-button");
 #endif
         gtk_widget_queue_draw(GTK_WIDGET(m_pToolbar));
     }
@@ -11320,6 +11324,8 @@ public:
         gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(pItem), pImage);
 #else
         gtk_button_set_child(GTK_BUTTON(pItem), pImage);
+        // versions of gtk4 > 4.2.1 might do this on their own
+        gtk_widget_remove_css_class(GTK_WIDGET(pItem), "text-button");
 #endif
     }