ui: fix unselect for the popupmenu

vhakulinen · Nov 29, 2022 · 19dbfbf · 19dbfbf
1 parent 1c380dc
commit 19dbfbf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/ui/src/components/popupmenu/imp.rs b/ui/src/components/popupmenu/imp.rs
@@ -90,6 +90,8 @@ impl ObjectImpl for Popupmenu {
             row.set_item(&item.borrow());
         });
 
+        self.selection_model.set_autoselect(false);
+        self.selection_model.set_can_unselect(true);
         self.selection_model.set_model(Some(&*self.store.borrow()));
         self.listview.set_model(Some(&self.selection_model));
         self.listview.set_factory(Some(&factory));

diff --git a/ui/src/components/popupmenu/mod.rs b/ui/src/components/popupmenu/mod.rs
@@ -40,7 +40,12 @@ impl Popupmenu {
         let imp = self.imp();
 
         if n < 0 {
-            imp.selection_model.unselect_all();
+            // NOTE(ville): unselect_all is not supported on gtk::SingleSelection model,
+            // so we'll have to unselected the selected item manually.
+            let selected = imp.selection_model.selected();
+            if selected != gtk::INVALID_LIST_POSITION {
+                imp.selection_model.unselect_item(selected);
+            }
         } else {
             let n = n as u32;
             imp.selection_model.select_item(n, true);