Merge lp:~jeremywootten/pantheon-files/fix-1675234-enter-while-searching-with-no-hits into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Prevent the path bar emitting a path-change request if Enter is pressed before SearchResults has grabbed keyboard focus (which only occurs once the search window has popped up after at least one hit has been found).

This was causing a request for a non-existent folder to be emitted.

This branch prevents the path bar emitting a path-change request if Enter is pressed before SearchResults has grabbed keyboard focus (which only occurs once the search window has popped up after at least one hit has been found).

This was causing a request for a non-existent folder to be emitted.

=== modified file 'src/View/Widgets/BreadcrumbsEntry.vala'
--- src/View/Widgets/BreadcrumbsEntry.vala	2017-02-10 19:35:18 +0000
+++ src/View/Widgets/BreadcrumbsEntry.vala	2017-04-04 17:37:27 +0000
@@ -33,6 +33,8 @@
          * user enter /home/user/a, we will search for "a". */
         string to_search = "";
 
+        public bool search_mode = false; // Used to suppress activate events while searching
+
         /** Drag and drop support **/
         public enum TargetType {
             TEXT_URI_LIST,
@@ -73,6 +75,13 @@
     /************************************************/
         public override bool on_key_press_event (Gdk.EventKey event) {
             switch (event.keyval) {
+                case Gdk.Key.Return:
+                case Gdk.Key.KP_Enter:
+                case Gdk.Key.ISO_Enter:
+                    if (search_mode) {
+                        return true;
+                    }
+                    break;
                 case Gdk.Key.KP_Tab:
                 case Gdk.Key.Tab:
                     complete ();

=== modified file 'src/View/Widgets/LocationBar.vala'
--- src/View/Widgets/LocationBar.vala	2017-02-10 19:35:18 +0000
+++ src/View/Widgets/LocationBar.vala	2017-04-04 17:37:27 +0000
@@ -25,7 +25,16 @@
         private BreadcrumbsEntry bread;
         private SearchResults search_results;
         private GLib.File? search_location = null;
-        public bool search_mode {get; private set;}
+
+        public bool search_mode {
+            get {
+                return bread.search_mode;
+            }
+
+            private set {
+                bread.search_mode = value; //Ensure no path change requests from entry while searching
+            }
+        }
 
         public new bool sensitive {
             set {