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

Proposed by Akshay Shekher on 2014-05-24
Status: Merged
Approved by: Daniel Fore on 2014-05-24
Approved revision: 418
Merged at revision: 419
Proposed branch: lp:~voldyman/slingshot/fixes-1263999
Merge into: lp:~elementary-pantheon/slingshot/trunk
Diff against target: 20 lines (+6/-3)
1 file modified
src/SlingshotView.vala (+6/-3)
To merge this branch: bzr merge lp:~voldyman/slingshot/fixes-1263999
Reviewer Review Type Date Requested Status
Avi Romanoff 2014-05-24 Approve on 2014-05-24
Review via email: mp+220854@code.launchpad.net

Commit message

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.

Description of the change

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.

To post a comment you must log in.
Avi Romanoff (aroman) wrote :

Wicked. Approve!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/SlingshotView.vala'
2--- src/SlingshotView.vala 2014-03-01 15:19:12 +0000
3+++ src/SlingshotView.vala 2014-05-24 09:55:14 +0000
4@@ -234,11 +234,14 @@
5
6 public override bool button_press_event (Gdk.EventButton event) {
7 var pointer = Gdk.Display.get_default ().get_device_manager ().get_client_pointer ();
8-
9- if (pointer.get_window_at_position (null, null) != get_window ()) {
10+
11+ // get_window_at_position returns null if the window belongs to another application.
12+ if (pointer.get_window_at_position (null, null) == null) {
13 hide ();
14+
15+ return true;
16 }
17-
18+
19 return false;
20 }
21

Subscribers

People subscribed via source and target branches