gtk4: insert an intermediate GtkBox as 'toplevel'

so we only have to concern outselves about GtkBox and GtkGrid as
containers

Change-Id: I7154c6256d26b0bb1e13a75eb063ae86d3632bf6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118479
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

1 files changed, 47 insertions, 35 deletions

diff --git a/sfx2/uiconfig/ui/tabbarcontents.ui b/sfx2/uiconfig/ui/tabbarcontents.ui
index 31a8ceb818b4..d1fe113122b4 100644
--- a/sfx2/uiconfig/ui/tabbarcontents.ui
+++ b/sfx2/uiconfig/ui/tabbarcontents.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.1 -->
+<!-- Generated with glade 3.38.2 -->
 <interface domain="sfx">
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkImage" id="image6">
@@ -72,65 +72,77 @@
       </object>
     </child>
   </object>
-  <object class="GtkWindow" id="toplevel">
+  <object class="GtkWindow" id="window">
     <property name="can-focus">False</property>
     <child>
-      <object class="GtkBox" id="TabBarContents">
+      <object class="GtkBox" id="toplevel">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <child>
-          <object class="GtkBox">
+          <object class="GtkBox" id="TabBarContents">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="border-width">2</property>
             <property name="orientation">vertical</property>
             <child>
-              <object class="GtkMenuButton" id="menubutton">
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="tooltip-text" translatable="yes" context="tabbar|menubutton|tool_tip">Sidebar Settings</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <property name="margin-bottom">3</property>
-                <property name="image">image6</property>
-                <property name="relief">none</property>
-                <property name="always-show-image">True</property>
-                <property name="popup">mainmenu</property>
-                <property name="use-popover">False</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToolbar" id="measure">
+              <object class="GtkBox">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="halign">center</property>
+                <property name="border-width">2</property>
                 <property name="orientation">vertical</property>
-                <property name="toolbar-style">icons</property>
-                <property name="show-arrow">False</property>
                 <child>
-                  <object class="GtkToggleToolButton" id="toggle">
+                  <object class="GtkMenuButton" id="menubutton">
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">True</property>
+                    <property name="tooltip-text" translatable="yes" context="tabbar|menubutton|tool_tip">Sidebar Settings</property>
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
+                    <property name="margin-bottom">3</property>
+                    <property name="image">image6</property>
+                    <property name="relief">none</property>
+                    <property name="always-show-image">True</property>
+                    <property name="popup">mainmenu</property>
+                    <property name="use-popover">False</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToolbar" id="measure">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
-                    <property name="use-underline">True</property>
-                    <property name="icon-name">sfx2/res/symphony/sidebar-property-large.png</property>
+                    <property name="halign">center</property>
+                    <property name="orientation">vertical</property>
+                    <property name="toolbar-style">icons</property>
+                    <property name="show-arrow">False</property>
+                    <child>
+                      <object class="GtkToggleToolButton" id="toggle">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="use-underline">True</property>
+                        <property name="icon-name">sfx2/res/symphony/sidebar-property-large.png</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="homogeneous">True</property>
+                      </packing>
+                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="position">0</property>
               </packing>
             </child>
           </object>