Working view repositioning (can now modify position)

Deren Vural · Deren Vural · commit e78e537131bb · 2023-01-08T21:39:00.000Z
Updated ModificationWindow UI:
- Added a new "AdwActionRow" object "view_position_input" for view position

Updated ModificationWindow class:
- Added template_child "view_position_input"
- Fixed a bug in the "reorder_data()" function that meant that re-ordering views broke the stored config
- Cleaned up some debug print statements
- Fixed bug where "reorder_data()" function was called from "update_stored_data()" function with the wrong "remove" input parameter
- Added "view_position_changed()" function as template callback for "view_position_input" object
- Updated add/remove component row code for the new button
- View component and position spinbuttons are limited to number of views/components

Signed-off-by: Deren Vural &lt;derenv@live.co.uk&gt;
diff --git a/src/modificationwindow/imp.rs b/src/modificationwindow/imp.rs
@@ -69,6 +69,8 @@ pub struct ModificationWindow {
     #[template_child]
     pub view_components_amount_input: TemplateChild<SpinButton>,
     #[template_child]
+    pub view_position_input: TemplateChild<SpinButton>,
+    #[template_child]
     pub view_modifier_listbox: TemplateChild<ListBox>,
     #[template_child]
     pub button_row: TemplateChild<ActionRow>,
@@ -146,6 +148,9 @@ impl ModificationWindow {
         let new_view_title: String = self.new_view_title.take();
         self.new_view_title.set(new_view_title.clone());
 
+        // Get old ID
+        let old_id: i32 = self.old_view_id.clone().get().expect("`old-view-id` invalid..").to_owned();
+
         // If present in saved settings
         if stored_views_data.len() == 0 {
             // no views exist
@@ -155,9 +160,7 @@ impl ModificationWindow {
             for index in 0..stored_views_data.len() {
                 // Split current viewconfig
                 let sub_items: Vec<&str> = stored_views_data[index].split(':').collect();
-                // println!("current title: `{}`", sub_items[2]); //TEST
-                // println!("searching for old title: `{}`", old_view_title); //TEST
-                // println!("searching for new title: `{}`", new_view_title); //TEST
+                // println!("current item: `{}`", stored_views_data[index]); //TEST
 
                 // If viewconfig is for this GPU (i.e. has valid UUID) and IS NOT the current view
                 if (sub_items[0] == uuid, sub_items[2] != new_view_title) == (true, true) {
@@ -202,22 +205,29 @@ impl ModificationWindow {
                             // println!("edit required"); //TEST
                             // println!("reorder"); //TEST
 
-                            // If same position & re-order
-                            new_id += 1; // Modify order
+                            // If same position & re-order, we need to check direction of change
+                            if old_id < new_id {
+                                new_id -= 1; // Modify order
+                            } else if old_id > new_id {
+                                new_id += 1; // Modify order
+                            }
 
                             // Update record
                             stored_views_data[index] =
                                 uuid.clone() + ":" + &new_id.to_string() + ":" + sub_items[2];
                         }
                         _ => {
+                            // println!("tuple `{} {} {}`", new_id > this_id, new_id == this_id, remove);
+
                             // otherwise ignore
-                            // println!("NO edit required"); //TEST
+                            //println!("NO edit required"); //TEST
                         }
                     }
                 }
             }
 
             // Update stored viewconfigs
+            // println!("updated views: `{:?}`", stored_views_data); //TEST
             self.update_setting::<Vec<String>>("viewconfigs", stored_views_data);
         }
     }
@@ -512,7 +522,7 @@ impl ModificationWindow {
                         // println!("viewconfig updated.."); //TEST
 
                         // Re-order remaining views
-                        self.reorder_data(true);
+                        self.reorder_data(false);
                     }
                     // MATCH name is the same, id is different
                     (true, false) => {
@@ -532,7 +542,7 @@ impl ModificationWindow {
                         // println!("viewconfig updated.."); //TEST
 
                         // Re-order remaining views
-                        self.reorder_data(true);
+                        self.reorder_data(false);
                     }
                     // MATCH name is the same, id is the same
                     (true, true) => {
@@ -718,7 +728,7 @@ impl ModificationWindow {
                 self.update_setting::<Vec<String>>("viewconfigs", stored_views_data);
 
                 // Re-order remaining views
-                self.reorder_data(true);
+                self.reorder_data(false);
 
                 // Get current components
                 let mut current_components: Vec<ViewComponent> = self.view_components_list.take();
@@ -876,6 +886,35 @@ impl ModificationWindow {
           //     println!("NEW NAME INVALID..");
           // }
     }
+
+    /**
+     * Name:
+     * view_position_changed
+     *
+     * Description:
+     * Template callback for changing the position of the current view
+     *
+     * Made:
+     * 08/01/2023
+     *
+     * Made by:
+     * Deren Vural
+     *
+     * Notes:
+     *
+     */
+    #[template_callback]
+    fn view_position_changed(&self, spinbutton: &SpinButton) {
+        // Validate amount
+        let new_amount: i32 = spinbutton.value() as i32;
+        // println!("input view position: `{}`", new_amount); //TEST
+        // println!("new view position: `{}`", new_amount - 1); //TEST
+
+        // Update stored ID
+        self.new_view_id.set(new_amount - 1);
+    }
+
+
     /**
      * Name:
      * view_components_amount_changed
@@ -909,7 +948,7 @@ impl ModificationWindow {
             self.view_modifier_listbox.remove(
                 &self
                     .view_modifier_listbox
-                    .row_at_index((1 + components.len()) as i32)
+                    .row_at_index((2 + components.len()) as i32)
                     .unwrap(),
             );
 
@@ -960,7 +999,7 @@ impl ModificationWindow {
             // Add new item, needs defaults (i.e. None)
             let pos: i32 = components.len() as i32;
             // println!("inserting in position: `{}`", pos); //TEST
-            self.view_modifier_listbox.insert(&row, 2 + pos);
+            self.view_modifier_listbox.insert(&row, 3 + pos);
 
             // Create new item
             let new_item: ViewComponent = ViewComponent {
diff --git a/src/modificationwindow/mod.rs b/src/modificationwindow/mod.rs
@@ -174,14 +174,18 @@ impl ModificationWindow {
         let mut view_title: String = String::from("Default");
 
         // Retrieve name of current view
-        if view_title_list.len() == 0 {
+        let mut view_amount: usize = view_title_list.len();
+        if view_amount == 0 {
             // First view being added
             // Set new view id ('0' as is first view)
             self.set_property("new-view-id", 0);
         } else if view_id == "-1" {
             // Create new view title and id
             view_title = String::from("New");
-            self.set_property("new-view-id", view_title_list.len() as i32);
+            self.set_property("new-view-id", view_amount as i32);
+
+            // Increment count for spinwheel
+            view_amount += 1;
 
             // println!("   View ID: {}", view_id); //TEST
             // println!("View Title: {}", view_title); //TEST
@@ -213,8 +217,11 @@ impl ModificationWindow {
         let mut dropdowns: Vec<DropDown> = vec![];
 
         // println!("LETS GET LOOPIN"); //TEST
+        // If list of components is not empty
         if view_components_list.len() != 0 {
+            // For the list of components
             for index in 0..view_components_list.len() {
+                // Check if valid component
                 // println!("item: `{}`", view_components_list[index]); //TEST
                 let sub_items: Vec<&str> = view_components_list[index].split(':').collect();
                 if sub_items[1] == self.property::<String>("old-view-title") {
@@ -313,7 +320,7 @@ impl ModificationWindow {
                     // println!("inserting in position: `{}`", (1 + final_components.len())); //TEST
                     self.imp()
                         .view_modifier_listbox
-                        .insert(&row, (1 + final_components.len()) as i32);
+                        .insert(&row, (2 + final_components.len()) as i32);
                 }
             }
         }
@@ -342,13 +349,30 @@ impl ModificationWindow {
         self.imp().view_name_input.set_max_width_chars(10);
 
         // Create adjustment settings for number of view components SpinButton
-        //TODO: link the upper limit to the total different properties
+        // NOTE: Linked to the upper limit to the total different properties
         let adjustment: Adjustment =
             Adjustment::new(current_view_component_amount, 0.0, 10.0, 1.0, 2.0, 0.0);
         self.imp()
             .view_components_amount_input
             .configure(Some(&adjustment), 1.0, 0);
 
+
+        // Create adjustment settings for view position SpinButton
+        // NOTE: linked to the upper limit to the total views
+        if view_id == "-1" {
+            let adjustment: Adjustment =
+                Adjustment::new(view_amount as f64, 1.0, view_amount as f64, 1.0, 2.0, 0.0);
+            self.imp()
+                .view_position_input
+                .configure(Some(&adjustment), 1.0, 0);
+        } else {
+            let adjustment: Adjustment =
+                Adjustment::new(view_id.parse::<f64>().expect("Missing `old-view-id`..") + 1.0, 1.0, view_amount as f64, 1.0, 2.0, 0.0);
+            self.imp()
+                .view_position_input
+                .configure(Some(&adjustment), 1.0, 0);
+        }
+
         // Buttons
         // Apply
         self.imp().view_modification_apply_button.connect_clicked(
diff --git a/src/resources/modification-window.ui b/src/resources/modification-window.ui
@@ -78,6 +78,27 @@ SPDX-License-Identifier: GPL-3.0-or-later
                     </child>
                   </object>
                 </child>
+                <child>
+                  <object class="AdwActionRow">
+                    <!-- Properties -->
+                    <property name="title">View Position</property>
+                    <property name="subtitle">The position of this view</property>
+                    <property name="activatable">false</property>
+                    <property name="selectable">false</property>
+
+                    <!-- Children -->
+                    <child>
+                      <object class="GtkSpinButton" id="view_position_input">
+                        <!-- Signals -->
+                        <signal name="value-changed" handler="view_position_changed" swapped="true"/>
+
+                        <!-- Properties -->
+                        <property name="digits" translatable="yes">0</property>
+                        <property name="numeric">True</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
 
                 <child>
                   <object class="AdwActionRow" id="button_row">
