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

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkinst.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 9b2ce7341a02922ced19f3079ab5f6988a8a288d
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Oct 24 16:45:55 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Oct 24 21:38:33 2019 +0200

    adjust where the spacing between image and text is applied
    
    Change-Id: I9db12f5931667b8d0f5ccd63d62b2042be59d4b5
    Reviewed-on: https://gerrit.libreoffice.org/81465
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index e59e1391e368..9cc600dc12b5 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -6370,10 +6370,7 @@ private:
         if (!m_pImage)
         {
             m_pImage = GTK_IMAGE(gtk_image_new());
-            GtkStyleContext *pContext = gtk_widget_get_style_context(GTK_WIDGET(m_pMenuButton));
-            gint nImageSpacing(0);
-            gtk_style_context_get_style(pContext, "image-spacing", &nImageSpacing, nullptr);
-            gtk_box_pack_start(m_pBox, GTK_WIDGET(m_pImage), false, false, nImageSpacing);
+            gtk_box_pack_start(m_pBox, GTK_WIDGET(m_pImage), false, false, 0);
             gtk_box_reorder_child(m_pBox, GTK_WIDGET(m_pImage), 0);
             gtk_widget_show(GTK_WIDGET(m_pImage));
         }
@@ -6395,7 +6392,10 @@ public:
         g_object_ref(m_pLabel);
         gtk_container_remove(GTK_CONTAINER(m_pMenuButton), m_pLabel);
 
-        m_pBox = GTK_BOX(gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0));
+        gint nImageSpacing(2);
+        GtkStyleContext *pContext = gtk_widget_get_style_context(GTK_WIDGET(m_pMenuButton));
+        gtk_style_context_get_style(pContext, "image-spacing", &nImageSpacing, nullptr);
+        m_pBox = GTK_BOX(gtk_box_new(GTK_ORIENTATION_HORIZONTAL, nImageSpacing));
 
         gtk_box_pack_start(m_pBox, m_pLabel, false, false, 0);
         g_object_unref(m_pLabel);