From 70c9895ba53806a7084dd2421a35fefcd8a24f6d Mon Sep 17 00:00:00 2001
From: takotori <tranfelix99@gmail.com>
Date: Thu, 2 Nov 2023 16:31:32 +0100
Subject: [PATCH] Add scrollbar to sidebar and flowbox Set minimum height of
 scrolledwindow to 100

---
 src/resources/resetBluetooth.ui  |  4 ++-
 src/resources/resetMainWindow.ui | 33 ++++++++++++++----------
 src/resources/resetUI.cmb        | 44 +++++++++++++++++---------------
 src/resources/resetWiFi.ui       |  1 +
 4 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/src/resources/resetBluetooth.ui b/src/resources/resetBluetooth.ui
index 5c09e6e..ed88a67 100644
--- a/src/resources/resetBluetooth.ui
+++ b/src/resources/resetBluetooth.ui
@@ -48,12 +48,13 @@
                     <object class="GtkLabel">
                         <property name="halign">start</property>
                         <property name="justify">right</property>
-                        <property name="label">Available device</property>
+                        <property name="label">Available devices</property>
                         <property name="margin-start">5</property>
                     </object>
                 </child>
                 <child>
                     <object class="GtkScrolledWindow">
+                        <property name="min-content-height">100</property>
                         <property name="propagate-natural-height">True</property>
                         <child>
                             <object class="GtkViewport">
@@ -87,6 +88,7 @@
                 </child>
                 <child>
                     <object class="GtkScrolledWindow">
+                        <property name="min-content-height">100</property>
                         <property name="propagate-natural-height">True</property>
                         <child>
                             <object class="GtkViewport">
diff --git a/src/resources/resetMainWindow.ui b/src/resources/resetMainWindow.ui
index 63ff7af..60ae5ab 100644
--- a/src/resources/resetMainWindow.ui
+++ b/src/resources/resetMainWindow.ui
@@ -97,14 +97,23 @@
               </object>
             </child>
             <child>
-              <object class="GtkFlowBox" id="resetMain">
-                <property name="column-spacing">25</property>
-                <property name="hexpand">True</property>
-                <property name="hexpand-set">True</property>
-                <property name="margin-top">5</property>
-                <property name="row-spacing">25</property>
-                <property name="selection-mode">none</property>
-                <property name="valign">start</property>
+              <object class="GtkScrolledWindow">
+                <property name="propagate-natural-height">True</property>
+                <child>
+                  <object class="GtkViewport">
+                    <child>
+                      <object class="GtkFlowBox" id="resetMain">
+                        <property name="column-spacing">25</property>
+                        <property name="hexpand">True</property>
+                        <property name="hexpand-set">True</property>
+                        <property name="margin-top">5</property>
+                        <property name="row-spacing">25</property>
+                        <property name="selection-mode">none</property>
+                        <property name="valign">start</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
               </object>
             </child>
           </object>
@@ -129,12 +138,10 @@
               </object>
             </child>
             <child>
-              <object class="GtkViewport">
-                <property name="margin-top">5</property>
+              <object class="GtkScrolledWindow">
+                <property name="propagate-natural-height">True</property>
                 <child>
-                  <object class="GtkBox">
-                    <property name="orientation">vertical</property>
-                    <property name="width-request">150</property>
+                  <object class="GtkViewport">
                     <child>
                       <object class="GtkListBox" id="resetSidebarList">
                         <property name="css-name">resetList</property>
diff --git a/src/resources/resetUI.cmb b/src/resources/resetUI.cmb
index 3288001..8d41e21 100644
--- a/src/resources/resetUI.cmb
+++ b/src/resources/resetUI.cmb
@@ -21,16 +21,12 @@
 	(3,18,"GtkBox",None,2,None,None,None,-1,None),
 	(3,19,"GtkWindowHandle",None,18,None,None,None,None,None),
 	(3,20,"GtkSearchEntry","resetSearchEntry",19,None,None,None,None,None),
-	(3,21,"GtkViewport",None,18,None,None,None,1,None),
-	(3,22,"GtkBox",None,21,None,None,None,None,None),
-	(3,23,"GtkListBox","resetSidebarList",22,None,None,None,None,None),
 	(3,24,"GtkWindowHandle",None,3,None,None,None,None,None),
 	(3,25,"GtkBox",None,24,None,None,None,None,None),
 	(3,26,"GtkButton","resetSideBarToggle",25,None,None,None,None,None),
 	(3,27,"GtkButton","resetBack",25,None,None,None,1,None),
 	(3,28,"GtkButton","resetForward",25,None,None,None,2,None),
 	(3,31,"GtkButton","resetClose",25,None,None,None,5,None),
-	(3,32,"GtkFlowBox","resetMain",3,None,None,None,1,None),
 	(3,33,"GtkMenuButton",None,25,None,None,None,4,None),
 	(3,34,"GtkBox","resetPath",25,None,None,None,3,None),
 	(3,35,"GtkPopoverMenu","resetPopoverMenu",33,None,None,None,-1,None),
@@ -38,6 +34,12 @@
 	(3,37,"GtkButton",None,36,None,None,None,None,None),
 	(3,38,"GtkButton",None,36,None,None,None,1,None),
 	(3,39,"GtkButton","resetAboutButton",36,None,None,None,2,None),
+	(3,40,"GtkScrolledWindow",None,18,None,None,None,1,None),
+	(3,41,"GtkViewport",None,40,None,None,None,None,None),
+	(3,42,"GtkListBox","resetSidebarList",41,None,None,None,None,None),
+	(3,43,"GtkScrolledWindow",None,3,None,None,None,2,None),
+	(3,44,"GtkViewport",None,43,None,None,None,None,None),
+	(3,45,"GtkFlowBox","resetMain",44,None,None,None,None,None),
 	(4,7,"GtkBox","resetWifi",None,None,None,None,None,None),
 	(4,42,"GtkButton",None,7,None,None,None,2,None),
 	(4,54,"GtkListBox","resetWifiDetails",7,None,None,None,None,None),
@@ -143,11 +145,6 @@
 	(3,19,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
 	(3,20,"GtkSearchEntry","placeholder-text","Search",None,None,None,None,None,None,None,None,None),
 	(3,20,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
-	(3,21,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(3,22,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
-	(3,22,"GtkWidget","width-request","150",None,None,None,None,None,None,None,None,None),
-	(3,23,"GtkWidget","css-name","resetList",None,None,None,None,None,None,None,None,None),
-	(3,23,"GtkWidget","width-request","150",None,None,None,None,None,None,None,None,None),
 	(3,25,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
 	(3,26,"GtkButton","icon-name","sidebar-show-symbolic",None,None,None,None,None,None,None,None,None),
 	(3,26,"GtkWidget","visible","False",None,None,None,None,None,None,None,None,None),
@@ -161,13 +158,6 @@
 	(3,31,"GtkWidget","css-classes","resetClose",None,None,None,None,None,None,None,None,None),
 	(3,31,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
 	(3,31,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(3,32,"GtkFlowBox","column-spacing","25",None,None,None,None,None,None,None,None,None),
-	(3,32,"GtkFlowBox","row-spacing","25",None,None,None,None,None,None,None,None,None),
-	(3,32,"GtkFlowBox","selection-mode","none",None,None,None,None,None,None,None,None,None),
-	(3,32,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(3,32,"GtkWidget","hexpand-set","True",None,None,None,None,None,None,None,None,None),
-	(3,32,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(3,32,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
 	(3,33,"GtkMenuButton","can-shrink","True",None,None,None,None,None,None,None,None,None),
 	(3,33,"GtkMenuButton","icon-name","open-menu-symbolic",None,None,None,None,None,None,None,None,None),
 	(3,33,"GtkMenuButton","popover",None,None,None,None,None,35,None,None,None,None),
@@ -186,6 +176,17 @@
 	(3,38,"GtkButton","label","Preferences",None,None,None,None,None,None,None,None,None),
 	(3,39,"GtkButton","has-frame","False",None,None,None,None,None,None,None,None,None),
 	(3,39,"GtkButton","label","About",None,None,None,None,None,None,None,None,None),
+	(3,40,"GtkScrolledWindow","propagate-natural-height","True",None,None,None,None,None,None,None,None,None),
+	(3,42,"GtkWidget","css-name","resetList",None,None,None,None,None,None,None,None,None),
+	(3,42,"GtkWidget","width-request","150",None,None,None,None,None,None,None,None,None),
+	(3,43,"GtkScrolledWindow","propagate-natural-height","True",None,None,None,None,None,None,None,None,None),
+	(3,45,"GtkFlowBox","column-spacing","25",None,None,None,None,None,None,None,None,None),
+	(3,45,"GtkFlowBox","row-spacing","25",None,None,None,None,None,None,None,None,None),
+	(3,45,"GtkFlowBox","selection-mode","none",None,None,None,None,None,None,None,None,None),
+	(3,45,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
+	(3,45,"GtkWidget","hexpand-set","True",None,None,None,None,None,None,None,None,None),
+	(3,45,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(3,45,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
 	(4,7,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(4,7,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
 	(4,7,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
@@ -222,6 +223,7 @@
 	(4,64,"GtkLabel","label","Available networks",None,None,None,None,None,None,None,None,None),
 	(4,64,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
 	(4,64,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(4,65,"GtkScrolledWindow","min-content-height","100",None,None,None,None,None,None,None,None,None),
 	(4,65,"GtkScrolledWindow","propagate-natural-height","True",None,None,None,None,None,None,None,None,None),
 	(4,69,"GtkListBox","show-separators","True",None,None,None,None,None,None,None,None,None),
 	(4,69,"GtkWidget","css-classes","boxed-list",None,None,None,None,None,None,None,None,None),
@@ -307,7 +309,9 @@
 	(10,32,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(10,33,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(10,33,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
+	(10,34,"GtkScrolledWindow","min-content-height","100",None,None,None,None,None,None,None,None,None),
 	(10,34,"GtkScrolledWindow","propagate-natural-height","True",None,None,None,None,None,None,None,None,None),
+	(10,39,"GtkScrolledWindow","min-content-height","100",None,None,None,None,None,None,None,None,None),
 	(10,39,"GtkScrolledWindow","propagate-natural-height","True",None,None,None,None,None,None,None,None,None),
 	(10,44,"GtkLabel","justify","right",None,None,None,None,None,None,None,None,None),
 	(10,44,"GtkLabel","label","Connected devices",None,None,None,None,None,None,None,None,None),
@@ -396,11 +400,11 @@
 	(13,9,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None)
   </object_property>
   <object_data>
-	(3,23,"GtkWidget",1,1,None,None,None,None,None,None),
-	(3,23,"GtkWidget",2,2,None,1,None,None,None,None)
+	(3,42,"GtkWidget",1,1,None,None,None,None,None,None),
+	(3,42,"GtkWidget",2,2,None,1,None,None,None,None)
   </object_data>
   <object_data_arg>
-	(3,23,"GtkWidget",2,2,"name","b"),
-	(7,9,"GtkScale",2,2,"value","50.0")
+	(7,9,"GtkScale",2,2,"value","50.0"),
+	(3,42,"GtkWidget",2,2,"name","b")
   </object_data_arg>
 </cambalache-project>
diff --git a/src/resources/resetWiFi.ui b/src/resources/resetWiFi.ui
index e75b3fc..bbf83bb 100644
--- a/src/resources/resetWiFi.ui
+++ b/src/resources/resetWiFi.ui
@@ -78,6 +78,7 @@
         </child>
         <child>
           <object class="GtkScrolledWindow">
+            <property name="min-content-height">100</property>
             <property name="propagate-natural-height">True</property>
             <child>
               <object class="GtkViewport">