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

[Akshay Shekher]

Fixed bug 1263999, slingshot shouldn't close when the mouse is clicked inside the window.

the method returns null when the mouse is clicked on a window that doesn't belong to the current app so that check was added.

Fixed bug 1263999, slingshot shouldn't close when the mouse is clicked inside the window.

the method returns null when the mouse is clicked on a window that doesn't belong to the current app so that check was added.

[Avi Romanoff (aroman)]

Wicked. Approve!

review: Approve

=== modified file 'src/SlingshotView.vala'
--- src/SlingshotView.vala	2014-03-01 15:19:12 +0000
+++ src/SlingshotView.vala	2014-05-24 09:55:14 +0000
@@ -234,11 +234,14 @@
 
         public override bool button_press_event (Gdk.EventButton event) {
             var pointer = Gdk.Display.get_default ().get_device_manager ().get_client_pointer ();
-            
-            if (pointer.get_window_at_position (null, null) != get_window ()) {
+
+            // get_window_at_position returns null if the window belongs to another application.
+            if (pointer.get_window_at_position (null, null) == null) {
                 hide ();
+
+                return true;
             }
-            
+
             return false;
         }