From 6ff3919ac0a3d401f3b85632aae76fd39aca6e89 Mon Sep 17 00:00:00 2001
From: Stuart Hayhurst <stuart.a.hayhurst@gmail.com>
Date: Thu, 15 Jun 2023 17:50:12 +0100
Subject: [PATCH] Use GtkBox as parent container, rather than GtkGrid

---
 extension/ui/prefs-gtk4.ui | 16 ++--------------
 extension/ui/prefs.ui      | 15 ++++-----------
 2 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/extension/ui/prefs-gtk4.ui b/extension/ui/prefs-gtk4.ui
index 1b54678..afe46ff 100644
--- a/extension/ui/prefs-gtk4.ui
+++ b/extension/ui/prefs-gtk4.ui
@@ -4,10 +4,10 @@
   <object class="GtkBox" id="main-prefs">
     <property name="orientation">vertical</property>
     <child>
-      <object class="GtkGrid">
+      <object class="GtkBox">
         <property name="margin-start">12</property>
         <property name="margin-end">12</property>
-        <property name="column-homogeneous">1</property>
+        <property name="orientation">vertical</property>
         <child>
           <object class="GtkBox" id="general-settings-area">
             <property name="orientation">vertical</property>
@@ -78,10 +78,6 @@
                 </style>
               </object>
             </child>
-            <layout>
-              <property name="column">0</property>
-              <property name="row">0</property>
-            </layout>
           </object>
         </child>
         <child>
@@ -198,10 +194,6 @@
                 </style>
               </object>
             </child>
-            <layout>
-              <property name="column">0</property>
-              <property name="row">1</property>
-            </layout>
           </object>
         </child>
         <child>
@@ -220,10 +212,6 @@
                 <property name="justify">center</property>
               </object>
             </child>
-            <layout>
-              <property name="column">0</property>
-              <property name="row">2</property>
-            </layout>
           </object>
         </child>
       </object>
diff --git a/extension/ui/prefs.ui b/extension/ui/prefs.ui
index 0f0f478..c52dce2 100644
--- a/extension/ui/prefs.ui
+++ b/extension/ui/prefs.ui
@@ -5,13 +5,12 @@
   <object class="GtkBox" id="main-prefs">
     <property name="visible">1</property>
     <property name="orientation">vertical</property>
-    <!-- n-columns=3 n-rows=3 -->
     <child>
-      <object class="GtkGrid">
+      <object class="GtkBox">
         <property name="visible">1</property>
         <property name="margin-start">12</property>
         <property name="margin-end">12</property>
-        <property name="column-homogeneous">1</property>
+        <property name="orientation">vertical</property>
         <child>
           <object class="GtkBox" id="general-settings-area">
             <property name="visible">1</property>
@@ -104,10 +103,6 @@
               </packing>
             </child>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="gnome-43-settings-area">
@@ -259,8 +254,7 @@
             </child>
           </object>
           <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">1</property>
+            <property name="position">1</property>
           </packing>
         </child>
         <child>
@@ -283,8 +277,7 @@
             </child>
           </object>
           <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">2</property>
+            <property name="position">2</property>
           </packing>
         </child>
       </object>