Merge lp:~jeremywootten/pantheon-files/fix-1452574-ctrl-click-unselect into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Control-click on selected item now deselects it (lp:1452574)

This branch fixes a regression caused by rev 1811 whereby Ctrl-Click on a selected item no longer de-selected it.

To test:
1)
  a) Select one or more items using Ctrl-Click or otherwise
  b) Ctrl-Click on a selected item (icon or name) - that item deselects.

2) Check other button press linked behaviours unaffected (selection, activation, rubberbanding, DND, etc).

=== modified file 'src/View/AbstractDirectoryView.vala'
--- src/View/AbstractDirectoryView.vala	2015-04-18 12:10:52 +0000
+++ src/View/AbstractDirectoryView.vala	2015-05-10 10:19:11 +0000
@@ -181,6 +181,8 @@
         public bool single_click_mode {get; set;}
         protected bool should_activate = false;
         protected bool should_scroll = true;
+        protected bool should_deselect = false;
+        protected Gtk.TreePath? click_path = null;
         protected uint click_zone = ClickZone.ICON;
         protected uint previous_click_zone = ClickZone.ICON;
 
@@ -1404,9 +1406,9 @@
 
 /** Handle Drop target signals*/
         private bool on_drag_motion (Gdk.DragContext context,
-                             int x,
-                             int y,
-                             uint timestamp) {
+                                     int x,
+                                     int y,
+                                     uint timestamp) {
             /* if we don't have drop data already ... */
             if (!drop_data_ready && !get_drop_data (context, x, y, timestamp))
                 return false;
@@ -2449,7 +2451,7 @@
                         new_empty_folder ();
 
                    return true;
-                   
+
                 case Gdk.Key.A:
                     if (shift_pressed && only_control_pressed)
                         invert_selection ();
@@ -2694,7 +2696,6 @@
 
         protected virtual bool handle_primary_button_click (Gdk.EventButton event, Gtk.TreePath? path) {
             bool double_click_event = (event.type == Gdk.EventType.@2BUTTON_PRESS);
-            should_activate =  single_click_mode || double_click_event;
 
             if (!double_click_event)
                 start_drag_timer ((Gdk.Event)event);
@@ -2733,6 +2734,7 @@
                 unselect_path (path);
                 path = null;
             }
+            click_path = path;
 
             /* Unless single click renaming is enabled, treat name same as blank zone */
             if (!single_click_rename && click_zone == ClickZone.NAME)
@@ -2752,10 +2754,10 @@
              * dragging on blank areas
              */
             block_drag_and_drop ();
+
             /* Handle un-modified clicks or control-clicks here else pass on.
              */
             if (!no_mods && !only_control_pressed) {
-                block_drag_and_drop ();
                 return window.button_press_event (event);
             }
 
@@ -2763,7 +2765,8 @@
                 if (no_mods)
                     unselect_all ();
 
-                if (!on_blank)
+                /* If modifier pressed then default handler determines selection */
+                if (no_mods && !on_blank)
                     select_path (path);
             }
 
@@ -2773,20 +2776,32 @@
 
             switch (event.button) {
                 case Gdk.BUTTON_PRIMARY:
+                    /* Control-click should deselect previously selected path on key release (unless
+                     * pointer moves)
+                     */
+                    should_deselect = only_control_pressed && path_selected;
+
                     switch (click_zone) {
                         case ClickZone.BLANK_NO_PATH:
                             result = false;
                             break;
 
                         case ClickZone.BLANK_PATH:
+                        case ClickZone.ICON:
                             bool double_click_event = (event.type == Gdk.EventType.@2BUTTON_PRESS);
+                            /* determine whether should activate on key release (unless pointer moved)*/
                             should_activate =  no_mods &&
-                                               activate_on_blank &&
+                                               (!on_blank || activate_on_blank) &&
                                                (single_click_mode || double_click_event);
 
-                            if (!activate_on_blank || !path_selected) {
-                                result = false;
-                            } else
+                            /* We need to decide whether to rubberband or drag&drop.
+                             * Rubberband if modifer pressed or if not on the icon and either
+                             * the item is unselected or activate_on_blank is not enabled.
+                             */
+
+                            if (!no_mods || (on_blank && (!activate_on_blank || !path_selected)))
+                                 result = false; /* Rubberband */
+                            else
                                 result = handle_primary_button_click (event, path);
 
                             break;
@@ -2803,14 +2818,6 @@
                             rename_file (selected_files.data);
                             break;
 
-                        case ClickZone.ICON:
-                            /* Allow dragging of icons */
-                            unblock_drag_and_drop ();
-                            if (no_mods)
-                                result = handle_primary_button_click (event, path);
-
-                            break;
-
                         case ClickZone.EXPANDER:
                             /* on expanders (if any) or xpad. Handle ourselves so that clicking
                              * on xpad also expands/collapses row (accessibility)*/
@@ -2858,17 +2865,19 @@
 
             slot.active (should_scroll);
 
-            if (should_activate) {
-                Gtk.Widget widget = get_real_view ();
-                int x = (int)event.x;
-                int y = (int)event.y;
-
-                /* Only activate if pointer has not moved */
-                if (!Gtk.drag_check_threshold (widget, drag_x, drag_y, x, y))
+            Gtk.Widget widget = get_real_view ();
+            int x = (int)event.x;
+            int y = (int)event.y;
+            /* Only take action if pointer has not moved */
+            if (!Gtk.drag_check_threshold (widget, drag_x, drag_y, x, y)) {
+                if (should_activate)
                     activate_selected_items (Marlin.OpenFlag.DEFAULT);
+                else if (should_deselect && click_path != null)
+                    unselect_path (click_path);
             }
-
             should_activate = false;
+            should_deselect = false;
+            click_path = null;
             return false;
         }
 
 
=== modified file 'src/View/ListView.vala'
--- src/View/ListView.vala	2015-03-26 02:19:38 +0000
+++ src/View/ListView.vala	2015-05-10 10:19:11 +0000
@@ -53,7 +53,7 @@
                     var renderer = new Gtk.CellRendererText ();
                     var col = new Gtk.TreeViewColumn.with_attributes (column_titles [k - fnc],
                                                                       renderer,
-                                                                      "text", k);     
+                                                                      "text", k);
                     col.set_sort_column_id (k);
                     col.set_resizable (false);
                     col.set_expand (false);
@@ -207,10 +207,10 @@
         protected override bool get_next_visible_iter (ref Gtk.TreeIter iter, bool recurse = true) {
             Gtk.TreePath? path = model.get_path (iter);
             Gtk.TreeIter start = iter;
- 
+
             if (path == null)
                 return false;
- 
+
             if (recurse && tree.is_row_expanded (path)) {
                 Gtk.TreeIter? child_iter = null;
                 if (model.iter_children (out child_iter, iter)) {
@@ -218,7 +218,7 @@
                     return true;
                 }
             }
- 
+
             if (model.iter_next (ref iter))
                 return true;
             else {