Merge pull request #59 from derenv/reorder_fix

Bugfix

Author: derenv

src/gpu_page/mod.rs

@@ -593,8 +593,8 @@ impl GpuPage {
         // Load list of Properties for current Page
         let loaded_properties_data: Vec<String> =
             settings_obj.get::<Vec<String>>("viewcomponentconfigs");
-        // println!("items saved #: `{}`", loaded_properties_data.len()); //TEST
-        // println!("items saved: `{:?}`", loaded_properties_data); //TEST
+        println!("items saved #: `{}`", loaded_properties_data.len()); //TEST
+        println!("items saved: `{:?}`", loaded_properties_data); //TEST
 
         // If present in saved settings, use! otherwise follow below defaults
         if let 0 = loaded_properties_data.len() {
@@ -607,7 +607,7 @@ impl GpuPage {
                 vec![String::from(""); loaded_properties_data.len()];
 
             for index in 0..loaded_properties_data.len() {
-                // println!("item: `{}`", loaded_properties_data[index]); //TEST
+                println!("item: `{}`", loaded_properties_data[index]); //TEST
 
                 // Split current item into the 4 parts
                 let parts: Vec<&str> = loaded_properties_data[index]
@@ -621,19 +621,19 @@ impl GpuPage {
 
                 // If from valid page
                 if parts[0] == self.property::<String>("uuid") {
-                    // println!("VALID UUID"); //TEST
+                    println!("VALID UUID"); //TEST
 
                     // If from valid view
                     if parts[1] == view_name {
-                        // println!("VALID VIEW #"); //TEST
+                        println!("VALID VIEW #"); //TEST
 
                         // If a valid position
                         match parts[2].parse::<usize>() {
                             Ok(position) => {
-                                // println!("POSITION INDEX: `{}`", position); //TEST
+                                println!("POSITION INDEX: `{}`", position); //TEST
                                 if position <= loaded_properties_data.len() {
-                                    // println!("VALID POSITION INDEX"); //TEST
-                                    // println!("VALID PROPERTY: `{}`", parts[3]); //TEST
+                                    println!("VALID POSITION INDEX"); //TEST
+                                    println!("VALID PROPERTY: `{}`", parts[3]); //TEST
 
                                     // Add to final list
                                     loaded_properties[position] = parts[3].to_owned();

src/modificationwindow/imp.rs

@@ -182,40 +182,57 @@ impl ModificationWindow {
                         .parse::<i32>()
                         .expect("Malformed gschema data..");
 
+                    // println!("old_id: `{}`", old_id); //TEST
+                    // println!("new_id: `{}`", new_id); //TEST
+                    // println!("this_id: `{}`", this_id); //TEST
+
                     // If viewconfig was at/above current view position
                     match (new_id > this_id, new_id == this_id, remove) {
                         (true, false, true) => {
                             // println!("edit required"); //TEST
                             // println!("removing"); //TEST
 
                             // If above position & removing
+                            // println!("new_id: `{}` modified by -1", new_id); //TEST
                             new_id -= 1; // Modify order
+                            // println!("new_id: `{}`", new_id); //TEST
 
                             // Update record
                             stored_views_data[index] =
                                 uuid.clone() + ":" + &new_id.to_string() + ":" + sub_items[2];
                         }
                         (true, false, false) => {
                             // println!("edit required"); //TEST
-                            // println!("reorder"); //TEST
+                            // println!("tff reorder"); //TEST
 
                             // If above position &  re-order
+                            // println!("new_id: `{}` modified by -1", new_id); //TEST
                             new_id -= 1; // Modify order
+                            // println!("new_id: `{}`", new_id); //TEST
 
                             // Update record
                             stored_views_data[index] =
                                 uuid.clone() + ":" + &new_id.to_string() + ":" + sub_items[2];
                         }
                         (false, true, false) => {
                             // println!("edit required"); //TEST
-                            // println!("reorder"); //TEST
+                            // println!("ftf reorder"); //TEST
 
                             // 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 {
+                            if old_id == -1 {
+                                // if inserting new view
+                                // println!("new_id: `{}` modified by +1", new_id); //TEST
                                 new_id += 1; // Modify order
+                            } else {
+                                if old_id < new_id {
+                                    // println!("new_id: `{}` modified by -1", new_id); //TEST
+                                    new_id -= 1; // Modify order
+                                } else if old_id > new_id {
+                                    // println!("new_id: `{}` modified by +1", new_id); //TEST
+                                    new_id += 1; // Modify order
+                                }
                             }
+                            // println!("new_id: `{}`", new_id); //TEST
 
                             // Update record
                             stored_views_data[index] =
@@ -225,7 +242,8 @@ impl ModificationWindow {
                             // println!("tuple `{} {} {}`", new_id > this_id, new_id == this_id, remove);
 
                             // otherwise ignore
-                            //println!("NO edit required"); //TEST
+                            // println!("new_id: `{}` NOT modified", new_id); //TEST
+                            // println!("NO edit required"); //TEST
                         }
                     }
                 }