From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Thu, 12 Jun 2008 11:35:40 +0000 (+0100)
Subject: Saner selection choice for popup menus.
X-Git-Tag: 4.1~15^2~39
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/83a01160745efbe65674adba3fa9f60f8ed75e6e

Saner selection choice for popup menus.
- if the clicked row is already selected, leave the selection as it is
- if the click is not on any row, leave the selection as it is
- if the clicked row is not selected, select ONLY that row
---

diff --git a/disobedience/popup.c b/disobedience/popup.c
index ce17a73..4e09937 100644
--- a/disobedience/popup.c
+++ b/disobedience/popup.c
@@ -56,23 +56,28 @@ void popup(GtkWidget **menup,
                  event->button, event->time);
 }
 
-/** @brief Make sure that something is selected
+/** @brief Make sure the right thing is selected
  * @param widget Tree view
- * @param event Mouse event (the hovered row will be selected)
+ * @param event Mouse event
  */
 void ensure_selected(GtkTreeView *treeview,
                      GdkEventButton *event) {
   GtkTreeSelection *selection = gtk_tree_view_get_selection(treeview);
-  if(gtk_tree_selection_count_selected_rows(selection) == 0) {
-    GtkTreePath *path;
-    if(gtk_tree_view_get_path_at_pos(treeview,
-                                     event->x, event->y,
-                                     &path,
-                                     NULL,
-                                     NULL, NULL)) 
-      gtk_tree_selection_select_path(selection, path);
-    gtk_tree_path_free(path);
+  /* Get the path of the hovered item */
+  GtkTreePath *path;
+  if(!gtk_tree_view_get_path_at_pos(treeview,
+                                    event->x, event->y,
+                                    &path,
+                                    NULL,
+                                    NULL, NULL))
+    return;                     /* If there isn't one, do nothing */
+  if(!gtk_tree_selection_path_is_selected(selection, path)) {
+    /* We're hovered over one thing but it's not the selected row.  This is
+     * very confusing for the poor old user so we select the hovered row. */
+    gtk_tree_selection_unselect_all(selection);
+    gtk_tree_selection_select_path(selection, path);
   }
+  gtk_tree_path_free(path);
 }
 
 /*