From dfd2e6d6e82a17f24478673e6da82ead4cd5caba Mon Sep 17 00:00:00 2001
From: Felix Morgner <felix.morgner@gmail.com>
Date: Sun, 14 Jul 2024 01:52:25 +0200
Subject: res/ui: clean up main window structure

---
 res/windows/main.ui     | 18 +++++++++---------
 res/windows/windows.cmb | 19 ++++++++++---------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/res/windows/main.ui b/res/windows/main.ui
index 2ad66f7..1e2ae9c 100644
--- a/res/windows/main.ui
+++ b/res/windows/main.ui
@@ -10,24 +10,24 @@
       <object class="AdwToolbarView">
         <property name="content">
           <object class="GtkScrolledWindow">
-            <property name="vexpand">True</property>
-            <child>
+            <property name="child">
               <object class="AdwClamp">
                 <property name="child">
                   <object class="GtkListBox" id="participant_list">
-                    <property name="margin-bottom">18</property>
-                    <property name="margin-end">12</property>
-                    <property name="margin-start">12</property>
-                    <property name="margin-top">18</property>
-                    <property name="selection-mode">none</property>
-                    <property name="valign">start</property>
                     <style>
                       <class name="boxed-list"/>
                     </style>
                   </object>
                 </property>
+                <property name="margin-bottom">18</property>
+                <property name="margin-end">12</property>
+                <property name="margin-start">12</property>
+                <property name="margin-top">18</property>
+                <property name="valign">start</property>
+                <style/>
               </object>
-            </child>
+            </property>
+            <property name="vexpand">True</property>
           </object>
         </property>
         <child type="top">
diff --git a/res/windows/windows.cmb b/res/windows/windows.cmb
index 9483e85..94ceedb 100644
--- a/res/windows/windows.cmb
+++ b/res/windows/windows.cmb
@@ -43,6 +43,7 @@
 	(1,1,"GtkWindow","default-width","360",None,None,None,None,None,None,None,None,None),
 	(1,2,"AdwToolbarView","content",None,None,None,None,None,4,None,None,None,None),
 	(1,3,"AdwHeaderBar","title-widget",None,None,None,None,None,6,None,None,None,None),
+	(1,4,"GtkScrolledWindow","child",None,None,None,None,None,11,None,None,None,None),
 	(1,4,"GtkWidget","vexpand","True",None,None,None,None,None,None,None,None,None),
 	(1,6,"AdwWindowTitle","title","Turns",1,None,None,None,None,None,None,None,None),
 	(1,7,"GtkMenuButton","icon-name","open-menu",None,None,None,None,None,None,None,None,None),
@@ -51,12 +52,11 @@
 	(1,10,"(item)","action","app.quit",None,None,None,None,None,None,None,None,None),
 	(1,10,"(item)","label","_Quit",1,None,None,None,None,None,None,None,None),
 	(1,11,"AdwClamp","child",None,None,None,None,None,12,None,None,None,None),
-	(1,12,"GtkListBox","selection-mode","none",None,None,None,None,None,None,None,None,None),
-	(1,12,"GtkWidget","margin-bottom","18",None,None,None,None,None,None,None,None,None),
-	(1,12,"GtkWidget","margin-end","12",None,None,None,None,None,None,None,None,None),
-	(1,12,"GtkWidget","margin-start","12",None,None,None,None,None,None,None,None,None),
-	(1,12,"GtkWidget","margin-top","18",None,None,None,None,None,None,None,None,None),
-	(1,12,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
+	(1,11,"GtkWidget","margin-bottom","18",None,None,None,None,None,None,None,None,None),
+	(1,11,"GtkWidget","margin-end","12",None,None,None,None,None,None,None,None,None),
+	(1,11,"GtkWidget","margin-start","12",None,None,None,None,None,None,None,None,None),
+	(1,11,"GtkWidget","margin-top","18",None,None,None,None,None,None,None,None,None),
+	(1,11,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
 	(2,1,"AdwDialog","child",None,None,None,None,None,2,None,None,None,None),
 	(2,1,"AdwDialog","default-widget",None,None,None,None,None,None,None,None,None,None),
 	(2,1,"AdwDialog","title","Add Participant",None,None,None,None,None,None,None,None,None),
@@ -88,13 +88,14 @@
 	(1,4,"GtkWidget",2,2,None,1,None,None,None,None),
 	(1,3,"GtkWidget",1,1,None,None,None,None,None,None),
 	(1,2,"GtkWidget",1,1,None,None,None,None,None,None),
-	(1,12,"GtkWidget",1,1,None,None,None,None,None,None),
-	(1,12,"GtkWidget",2,2,None,1,None,None,None,None),
 	(2,6,"GtkWidget",1,1,None,None,None,None,None,None),
 	(2,6,"GtkWidget",2,2,None,1,None,None,None,None),
 	(2,9,"GtkWidget",1,1,None,None,None,None,None,None),
 	(2,9,"GtkWidget",2,2,None,1,None,None,None,None),
-	(2,9,"GtkWidget",2,3,None,1,None,None,None,None)
+	(2,9,"GtkWidget",2,3,None,1,None,None,None,None),
+	(1,11,"GtkWidget",1,1,None,None,None,None,None,None),
+	(1,12,"GtkWidget",1,1,None,None,None,None,None,None),
+	(1,12,"GtkWidget",2,2,None,1,None,None,None,None)
   </object_data>
   <object_data_arg>
 	(1,1,"GtkWidget",2,2,"name","background"),
-- 
cgit v1.2.3