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

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk4/convert3to4.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 23d7e3965efb69f4df04a930104bac36eeeb0289
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Sep 16 10:38:05 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Sep 16 13:07:46 2021 +0200

    gtk4: set can-shrink to False for GtkPicture
    
    for the icon in GtkMenuButton in the calc, insert, header and footer in
    gtk 4.6 where the MenuButton begins to support a child widget again but
    the icon while now shown in squished
    
    Change-Id: Ibc274d88b1185eee0ee61973b40b5cde2d08f554
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122187
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk4/convert3to4.cxx b/vcl/unx/gtk4/convert3to4.cxx
index 5ffb37a700f0..7713e6f3f6a0 100644
--- a/vcl/unx/gtk4/convert3to4.cxx
+++ b/vcl/unx/gtk4/convert3to4.cxx
@@ -1280,6 +1280,9 @@ ConvertResult Convert3To4(const css::uno::Reference<css::xml::dom::XNode>& xNode
                         auto xUri = CreateProperty(xDoc, "file",
                                                    "private:///graphicrepository/" + sIconName);
                         xChild->insertBefore(xUri, xChildPropertyIconName);
+                        // calc, insert, header and footer, custom header menubutton icon
+                        auto xCanShrink = CreateProperty(xDoc, "can-shrink", "False");
+                        xChild->insertBefore(xCanShrink, xChildPropertyIconName);
                         xChild->removeChild(xChildPropertyIconName);
                     }
                 }