[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 c0a7b479aff23c887d23ca550c048f184eda7853
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Jun 5 16:05:25 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Jun 5 18:54:37 2021 +0200

    gtk4: MenuButtons can have images too
    
    Change-Id: Ib6a7eed8036273d5e31ddff5611ec42fb45ffa4a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116751
    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 6bb7e30918e9..da0ef100a6ef 100644
--- a/vcl/unx/gtk4/convert3to4.cxx
+++ b/vcl/unx/gtk4/convert3to4.cxx
@@ -476,6 +476,7 @@ ConvertResult Convert3To4(const css::uno::Reference<css::xml::dom::XNode>& xNode
             if (sName == "always-show-image")
             {
                 if (GetParentObjectType(xChild) == "GtkButton"
+                    || GetParentObjectType(xChild) == "GtkMenuButton"
                     || GetParentObjectType(xChild) == "GtkToggleButton")
                 {
                     // we will turn always-show-image into a GtkBox child for
@@ -489,6 +490,7 @@ ConvertResult Convert3To4(const css::uno::Reference<css::xml::dom::XNode>& xNode
             if (sName == "relief")
             {
                 if (GetParentObjectType(xChild) == "GtkToggleButton"
+                    || GetParentObjectType(xChild) == "GtkMenuButton"
                     || GetParentObjectType(xChild) == "GtkLinkButton"
                     || GetParentObjectType(xChild) == "GtkButton")
                 {
@@ -559,6 +561,7 @@ ConvertResult Convert3To4(const css::uno::Reference<css::xml::dom::XNode>& xNode
             if (sName == "image")
             {
                 if (GetParentObjectType(xChild) == "GtkButton"
+                    || GetParentObjectType(xChild) == "GtkMenuButton"
                     || GetParentObjectType(xChild) == "GtkToggleButton")
                 {
                     // find the image object, expected to be a child of "interface" and relocate