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

[Caolán McNamara (via logerrit)]

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

New commits:
commit c3a03f03187b697bce84a9efa2de9964eb5466a1
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri May 1 15:06:23 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri May 1 17:48:57 2020 +0200

    transfer halign and valign also
    
    Change-Id: I37bd5adab653f80a120cb9850a0bebd45c5cb7e7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93276
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 9d43dc9df103..76786d642d88 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -1785,8 +1785,14 @@ namespace
                     nullptr);
         }
 
-        gtk_widget_set_hexpand(pReplacement, gtk_widget_get_hexpand(pWidget));
-        gtk_widget_set_vexpand(pReplacement, gtk_widget_get_vexpand(pWidget));
+        if (gtk_widget_get_hexpand_set(pWidget))
+            gtk_widget_set_hexpand(pReplacement, gtk_widget_get_hexpand(pWidget));
+
+        if (gtk_widget_get_vexpand_set(pWidget))
+            gtk_widget_set_vexpand(pReplacement, gtk_widget_get_vexpand(pWidget));
+
+        gtk_widget_set_halign(pReplacement, gtk_widget_get_halign(pWidget));
+        gtk_widget_set_valign(pReplacement, gtk_widget_get_valign(pWidget));
 
         gtk_container_add(GTK_CONTAINER(pReplacement), pWidget);