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

[Caolán McNamara (via logerrit)]

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

New commits:
commit 66517fda4c40d0c20b52a3110ee169353ff8c227
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Sep 13 17:11:23 2022 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Sep 13 20:48:53 2022 +0200

    gtk4: move ComboBox "items" to the start to get "active" property working
    
    Change-Id: I6a6c1d2ca7793d1ec83992171f41993b1f736f67
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139872
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/unx/gtk4/convert3to4.cxx b/vcl/unx/gtk4/convert3to4.cxx
index d7d348029c9d..415bcab3d880 100644
--- a/vcl/unx/gtk4/convert3to4.cxx
+++ b/vcl/unx/gtk4/convert3to4.cxx
@@ -1509,6 +1509,13 @@ ConvertResult Convert3To4(const 
css::uno::Reference<css::xml::dom::XNode>& xNode
                 }
             }
         }
+        else if (xChild->getNodeName() == "items")
+        {
+            // gtk4-4.6.7 won't set an active item if the active item
+            // property precedes the list of combobox items so if we
+            // have "items" move them to the start
+            insertAsFirstChild(xNode, xNode->removeChild(xChild));
+        }
 
         xChild = xNextChild;
     }