Merge lp:~jeremywootten/pantheon-files/fix-1537536-search-selection-in-icon-view into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Stop emission of cursor-changed signals when clearing search list

This branch stops "cursor-changed" signals being emitted when clearing the search list, which was causing unexpected selections when no matches were found.

[Adam Bieńkowski (donadigo)]

Looks good, I am no longer getting strange selections.

review: Approve (code / tests)

=== modified file 'libwidgets/View/LocationBar.vala'
--- libwidgets/View/LocationBar.vala	2016-02-11 11:12:03 +0000
+++ libwidgets/View/LocationBar.vala	2016-04-07 10:13:59 +0000
@@ -28,7 +28,7 @@
         public bool search_mode {get; private set;}
 
         public signal void reload_request ();
-        public signal void focus_file_request (File file);
+        public signal void focus_file_request (File? file);
         public signal void escape ();
 
         public LocationBar () {
@@ -65,15 +65,13 @@
         }
 
         private void on_search_results_first_match_found (GLib.File? file) {
-            if (file != null) {
-                focus_file_request (file);
-            }
+            focus_file_request (file);
         }
+
         private void on_search_results_cursor_changed (GLib.File? file) {
-            if (file != null) {
-                focus_file_request (file);
-            }
+            focus_file_request (file);
         }
+
         private void on_search_results_realize () {
             (get_toplevel () as Gtk.Window).get_group ().add_window (search_results); /*Is this necessary every popup? */
         }
 
=== modified file 'libwidgets/View/SearchResults.vala'
--- libwidgets/View/SearchResults.vala	2016-02-11 11:12:03 +0000
+++ libwidgets/View/SearchResults.vala	2016-04-07 10:13:59 +0000
@@ -327,7 +327,6 @@
             }
         }
 
-
         bool on_button_press_event (Gdk.EventButton e) {
             if (e.x >= 0 && e.y >= 0 && e.x < get_allocated_width () && e.y < get_allocated_height ()) {
                 view.event (e);
@@ -616,12 +615,14 @@
 
                 is_grabbing = true;
             }
-            /* Also pair signal connect and disconnect */
-            view.cursor_changed.connect (on_cursor_changed);
+            /* Paired with disconnect function in popdown () */
+            connect_view_cursor_changed_signal ();
         }
 
         void popdown ()
         {
+            /* Paired with connect function in popup () */
+            disconnect_view_cursor_changed_signal ();
             if (is_grabbing) {
                 if (device == null) {
                     /* 'device' can become null during searching for reasons as yet unidentified. This ensures
@@ -635,8 +636,7 @@
                 Gtk.device_grab_remove (this, device);
                 is_grabbing = false;
             }
-            /* Also pair signal connect and disconnect */
-            view.cursor_changed.disconnect (on_cursor_changed);
+
             hide ();
         }
 
@@ -770,6 +770,9 @@
 
         protected void clear ()
         {
+            /* Disconnect the cursor-changed signal so that it does not get emitted when entries removed
+             * causing incorrect files to get selected in icon view */ 
+            disconnect_view_cursor_changed_signal ();
             Gtk.TreeIter parent, iter;
             for (var valid = list.get_iter_first (out parent); valid; valid = list.iter_next (ref parent)) {
                 if (!list.iter_nth_child (out iter, parent, 0))
@@ -779,6 +782,8 @@
             }
 
             resize_popup ();
+            /* Reconnect signal */
+            connect_view_cursor_changed_signal ();
         }
 
 
@@ -797,10 +802,11 @@
 
             filter.refilter ();
 
-            select_first ();
             if (local_search_finished && global_search_finished && list_empty ()) {
                 view.get_selection ().unselect_all ();
                 first_match_found (null);
+            } else {
+                select_first ();
             }
 
             if (local_search_finished && global_search_finished) {
@@ -999,6 +1005,13 @@
         public bool has_popped_up () {
             return is_grabbing;
         }
+
+        private void connect_view_cursor_changed_signal () {
+            view.cursor_changed.connect (on_cursor_changed);
+        }
+        private void disconnect_view_cursor_changed_signal () {
+            view.cursor_changed.disconnect (on_cursor_changed);
+        }
     }
 }
 
 
=== modified file 'src/View/ViewContainer.vala'
--- src/View/ViewContainer.vala	2016-03-06 10:18:25 +0000
+++ src/View/ViewContainer.vala	2016-04-07 10:13:59 +0000
@@ -404,15 +404,27 @@
             if (aslot != null)
                 aslot.set_frozen_state (is_frozen);
         }
+
+        private void set_all_selected (bool select_all) {
+            var aslot = get_current_slot ();
+            if (aslot != null) {
+                aslot.set_all_selected (select_all);
+            }
+        }
         
-        public void focus_location (GLib.File loc,
+        public void focus_location (GLib.File? loc,
                                     bool no_path_change = false,
                                     bool unselect_others = false) {
 
             /* This function navigates to another folder if necessary if 
              * select_in_current_only is not set to true.
              */
-            assert (loc != null);
+
+            /* Search can generate null focus requests if no match - deselect previous search selection */
+            if (loc == null) {
+                set_all_selected (false);
+                return;
+            }
 
             if (location.equal (loc)) {
                 return;