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

[Caolán McNamara (via logerrit)]

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

New commits:
commit a8ba9ce02f8d2b1fa5639a5bcc77693652152813
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon May 31 16:24:28 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon May 31 20:50:33 2021 +0200

    gtk4: we definitely want large icons where we were using GTK_ICON_SIZE_DIALOG
    
    e.g. in the hyperlink dialog
    
    Change-Id: Iecc6f3accde0ed56352dacdf423520565b6419c4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116485
    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 ed195f56a760..d64c486b5d12 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -20908,6 +20908,23 @@ ConvertResult Convert3To4(const Reference<css::xml::dom::XNode>& xNode)
                     xRemoveList.push_back(xChild);
             }
 
+            if (sName == "icon-size")
+            {
+                if (GetParentObjectType(xChild) == "GtkImage")
+                {
+                    if (xChild->getFirstChild()->getNodeValue() == "6")
+                    {
+                        auto xDoc = xChild->getOwnerDocument();
+                        // convert old GTK_ICON_SIZE_DIALOG to new GTK_ICON_SIZE_LARGE
+                        auto xIconSize = CreateProperty(xDoc, "icon-size", "2");
+                        xChild->getParentNode()->insertBefore(xIconSize, xChild);
+                        xRemoveList.push_back(xChild);
+                    }
+                    else
+                        SAL_WARN( "vcl.gtk", "what should we do with an icon-size of: " << xChild->getFirstChild()->getNodeValue());
+                }
+            }
+
             if (sName == "truncate-multiline")
             {
                 if (GetParentObjectType(xChild) == "GtkSpinButton")