From 536c5f0563ac49a3b2fd8bbfc1e343d37717b63a Mon Sep 17 00:00:00 2001
From: takotori <tranfelix99@gmail.com>
Date: Sun, 29 Oct 2023 15:57:27 +0100
Subject: [PATCH] fix some ui stuff

---
 src/components/window/handleSidebarClick.rs | 25 ++++++++++++++++++---
 src/resources/resetBluetoothEntry.ui        |  2 ++
 src/resources/resetMainWindow.ui            |  7 +++---
 src/resources/resetUI.cmb                   | 10 ++++++---
 src/resources/resetWifiEntry.ui             |  2 ++
 5 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/src/components/window/handleSidebarClick.rs b/src/components/window/handleSidebarClick.rs
index 9a06acc..d0cd3c6 100644
--- a/src/components/window/handleSidebarClick.rs
+++ b/src/components/window/handleSidebarClick.rs
@@ -1,18 +1,37 @@
-use gtk::FlowBox;
+use gtk::{Align, FlowBox, FlowBoxChild};
+use gtk::prelude::{FlowBoxChildExt, WidgetExt};
 use crate::components::audio::AudioBox;
 use crate::components::bluetooth::BluetoothBox;
 use crate::components::wifi::WifiBox;
 
 pub const HANDLE_CONNECTIVITY_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
     let wifibox = WifiBox::new();
+    let bluetoothBox = BluetoothBox::new();
+    let child1 = FlowBoxChild::new();
+    let child2 = FlowBoxChild::new();
+
+    wifibox.set_halign(Align::Start);
+    bluetoothBox.set_halign(Align::Start);
+
+    child1.set_halign(Align::Fill);
+    child2.set_halign(Align::Fill);
+
+    child1.set_child(Some(&wifibox));
+    child2.set_child(Some(&bluetoothBox));
+
     resetMain.remove_all();
-    resetMain.insert(&wifibox, -1);
+    resetMain.insert(&child1, -1);
+    resetMain.insert(&child2, -1);
+
+    // todo center flowbox children
 };
 
 pub const HANDLE_WIFI_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
     let wifibox = WifiBox::new();
     resetMain.remove_all();
-    resetMain.insert(&wifibox, -1);
+    let child = FlowBoxChild::new();
+    child.set_child(Some(&wifibox));
+    resetMain.insert(&child, -1);
 };
 
 pub const HANDLE_BLUETOOTH_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
diff --git a/src/resources/resetBluetoothEntry.ui b/src/resources/resetBluetoothEntry.ui
index cc6d728..5d629d1 100644
--- a/src/resources/resetBluetoothEntry.ui
+++ b/src/resources/resetBluetoothEntry.ui
@@ -3,6 +3,7 @@
 <interface>
     <requires lib="gtk" version="4.12"/>
     <template class="resetBluetoothEntry" parent="GtkListBoxRow">
+        <property name="selectable">False</property>
         <child>
             <object class="GtkBox">
                 <child>
@@ -24,6 +25,7 @@
                 </child>
                 <child>
                     <object class="GtkButton" id="resetBluetoothButton">
+                        <property name="has-frame">False</property>
                         <property name="icon-name">emblem-system-symbolic</property>
                     </object>
                 </child>
diff --git a/src/resources/resetMainWindow.ui b/src/resources/resetMainWindow.ui
index c06666f..49e6eb6 100644
--- a/src/resources/resetMainWindow.ui
+++ b/src/resources/resetMainWindow.ui
@@ -98,7 +98,8 @@
             <child>
               <object class="GtkFlowBox" id="resetMain">
                 <property name="column-spacing">25</property>
-                <property name="homogeneous">True</property>
+                <property name="hexpand">True</property>
+                <property name="hexpand-set">True</property>
                 <property name="row-spacing">25</property>
                 <property name="selection-mode">none</property>
                 <property name="valign">start</property>
@@ -112,13 +113,13 @@
         <property name="max-sidebar-width">180.0</property>
         <property name="sidebar">
           <object class="GtkBox">
+            <property name="margin-end">5</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkWindowHandle">
                 <property name="valign">start</property>
                 <child>
                   <object class="GtkSearchEntry" id="resetSearchEntry">
-                    <property name="margin-end">5</property>
                     <property name="placeholder-text">Search</property>
                     <property name="valign">start</property>
                   </object>
@@ -153,7 +154,7 @@
     <!-- Custom fragments -->
     <child>
       <object id="resetSidebarBreakpoint" class="AdwBreakpoint">
-    </object>
+      </object>
     </child>
   </template>
 </interface>
diff --git a/src/resources/resetUI.cmb b/src/resources/resetUI.cmb
index 1983f4c..3ef7922 100644
--- a/src/resources/resetUI.cmb
+++ b/src/resources/resetUI.cmb
@@ -35,7 +35,7 @@
 	(3,36,"GtkBox",None,35,None,None,None,-1,None),
 	(3,37,"GtkButton",None,36,None,None,None,None,None),
 	(3,38,"GtkButton",None,36,None,None,None,1,None),
-	(3,39,"GtkButton",None,36,None,None,None,2,None),
+	(3,39,"GtkButton","resetAboutButton",36,None,None,None,2,None),
 	(4,7,"GtkBox","resetWifi",None,None,None,None,None,None),
 	(4,8,"AdwClampScrollable",None,7,None,None,None,1,None),
 	(4,9,"GtkBox",None,8,None,None,None,None,None),
@@ -116,9 +116,9 @@
 	(3,3,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(3,3,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
 	(3,18,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
+	(3,18,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
 	(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","margin-end","5",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),
@@ -138,9 +138,9 @@
 	(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","homogeneous","True",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","halign","center",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),
@@ -181,6 +181,7 @@
 	(4,53,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
 	(4,53,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
 	(4,53,"GtkWidget","valign","end",None,None,None,None,None,None,None,None,None),
+	(5,1,"GtkListBoxRow","selectable","False",None,None,None,None,None,None,None,None,None),
 	(5,3,"GtkImage","icon-name","network-wireless-symbolic",None,None,None,None,None,None,None,None,None),
 	(5,3,"GtkWidget","margin-end","15",None,None,None,None,None,None,None,None,None),
 	(5,4,"GtkLabel","ellipsize","end",None,None,None,None,None,None,None,None,None),
@@ -190,6 +191,7 @@
 	(5,4,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
 	(5,4,"GtkWidget","margin-end","10",None,None,None,None,None,None,None,None,None),
 	(5,4,"GtkWidget","width-request","200",None,None,None,None,None,None,None,None,None),
+	(5,5,"GtkButton","has-frame","False",None,None,None,None,None,None,None,None,None),
 	(5,5,"GtkButton","icon-name","emblem-system-symbolic",None,None,None,None,None,None,None,None,None),
 	(5,5,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
 	(5,5,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
@@ -265,6 +267,7 @@
 	(10,21,"GtkWidget","valign","end",None,None,None,None,None,None,None,None,None),
 	(10,28,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
 	(10,28,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
+	(11,1,"GtkListBoxRow","selectable","False",None,None,None,None,None,None,None,None,None),
 	(11,3,"GtkImage","icon-name","input-mouse-symbolic",None,None,None,None,None,None,None,None,None),
 	(11,3,"GtkWidget","margin-end","15",None,None,None,None,None,None,None,None,None),
 	(11,4,"GtkLabel","ellipsize","end",None,None,None,None,None,None,None,None,None),
@@ -274,6 +277,7 @@
 	(11,4,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
 	(11,4,"GtkWidget","margin-end","10",None,None,None,None,None,None,None,None,None),
 	(11,4,"GtkWidget","width-request","200",None,None,None,None,None,None,None,None,None),
+	(11,5,"GtkButton","has-frame","False",None,None,None,None,None,None,None,None,None),
 	(11,5,"GtkButton","icon-name","emblem-system-symbolic",None,None,None,None,None,None,None,None,None)
   </object_property>
   <object_data>
diff --git a/src/resources/resetWifiEntry.ui b/src/resources/resetWifiEntry.ui
index 1f1c503..49b6d90 100644
--- a/src/resources/resetWifiEntry.ui
+++ b/src/resources/resetWifiEntry.ui
@@ -3,6 +3,7 @@
 <interface>
   <requires lib="gtk" version="4.12"/>
   <template class="resetWifiEntry" parent="GtkListBoxRow">
+    <property name="selectable">False</property>
     <child>
       <object class="GtkBox">
         <child>
@@ -25,6 +26,7 @@
         <child>
           <object class="GtkButton" id="resetWifiButton">
             <property name="halign">start</property>
+            <property name="has-frame">False</property>
             <property name="icon-name">emblem-system-symbolic</property>
             <property name="valign">center</property>
           </object>