Merge lp:~voldyman/slingshot/fixes-1261017 into lp:~elementary-pantheon/slingshot/trunk

[Akshay Shekher]

fix bug 1261017, Once the search bar gets focus, Super + Space does not close the window.

fix bug 1261017, Once the search bar gets focus, Super + Space does not close the window.

check the key press events for the search_entry, if super+space is detected, hide.

[Avi Romanoff (aroman)]

Looks good, works for me!

review: Approve

=== modified file 'src/SlingshotView.vala'
--- src/SlingshotView.vala	2014-03-01 15:19:12 +0000
+++ src/SlingshotView.vala	2014-05-24 10:27:51 +0000
@@ -267,6 +267,8 @@
             });
 
             event_box.key_press_event.connect (on_key_press);
+            search_entry.key_press_event.connect (search_entry_key_press);
+
             search_entry.search_changed.connect (() => this.search.begin (search_entry.text));
             search_entry.grab_focus ();
 
@@ -354,6 +356,15 @@
             }
         }
 
+        // Handle super+space when the user is typing in the search entry
+        private bool search_entry_key_press (Gdk.EventKey event) {
+            if ((event.keyval == Gdk.Key.space) && ((event.state & Gdk.ModifierType.SUPER_MASK) != 0)) {
+                hide ();
+                return true;
+            }
+            return false;
+        }
+
         /*
           Overriding the default handler results in infinite loop of error messages
           when an input method is in use (Gtk3 bug?).  Key press events are