fix: clean up context menu popup

Author: wash2

src/app.rs

@@ -677,6 +677,8 @@ impl cosmic::Application for CosmicAppLibrary {
                 return commands::popup::destroy_popup(MENU_ID.clone());
             }
             Message::SelectAction(action) => {
+                self.menu = None;
+                let mut tasks = vec![commands::popup::destroy_popup(MENU_ID.clone())];
                 if let Some(info) = self.menu.take().and_then(|i| self.entry_path_input.get(i)) {
                     match action {
                         MenuAction::Remove => {
@@ -686,7 +688,7 @@ impl cosmic::Application for CosmicAppLibrary {
                                     error!("{:?}", err);
                                 }
                             }
-                            return self.filter_apps();
+                            tasks.push(self.filter_apps());
                         }
                         MenuAction::DesktopAction(exec) => {
                             let mut exec = shlex::Shlex::new(&exec);
@@ -708,6 +710,7 @@ impl cosmic::Application for CosmicAppLibrary {
                         }
                     }
                 }
+                return cosmic::Task::batch(tasks);
             }
             Message::StartDrag(i) => {
                 self.dnd_icon = Some(i);
@@ -788,6 +791,8 @@ impl cosmic::Application for CosmicAppLibrary {
                 {
                     self.app_list_config.add_pinned(pinned_id, &app_list_helper);
                 }
+                self.menu = None;
+                return commands::popup::destroy_popup(MENU_ID.clone());
             }
             Message::UnPinFromAppTray(usize) => {
                 let pinned_id = self.entry_path_input.get(usize).map(|e| e.id.clone());
@@ -797,6 +802,8 @@ impl cosmic::Application for CosmicAppLibrary {
                     self.app_list_config
                         .remove_pinned(&pinned_id, &app_list_helper);
                 }
+                self.menu = None;
+                return commands::popup::destroy_popup(MENU_ID.clone());
             }
             Message::AppListConfig(config) => {
                 self.app_list_config = config;

src/app_group.rs

@@ -177,18 +177,27 @@ impl AppLibraryConfig {
     }
 
     pub fn remove(&mut self, i: usize) {
+        if i == 0 {
+            return;
+        }
         if i - 1 < self.groups.len() {
             self.groups.remove(i - 1);
         }
     }
 
     pub fn set_name(&mut self, i: usize, name: String) {
+        if i == 0 {
+            return;
+        }
         if i - 1 < self.groups.len() {
             self.groups[i - 1].name = name;
         }
     }
 
     pub fn remove_entry(&mut self, i: usize, id: &str) {
+        if i == 0 {
+            return;
+        }
         if let Some(group) = self.groups.get_mut(i - 1) {
             match &mut group.filter {
                 FilterType::AppIds(ids) => ids.retain(|conf_id| conf_id != id),
@@ -210,7 +219,7 @@ impl AppLibraryConfig {
     }
 
     pub fn add_entry(&mut self, i: usize, id: &str) {
-        if i - 1 < self.groups.len() {
+        if i > 0 && i - 1 < self.groups.len() {
             if let FilterType::AppIds(ids) = &mut self.groups[i - 1].filter {
                 if ids.iter().all(|s| s != id) {
                     ids.push(id.to_string());