Merge lp:~l-admin-3/slingshot/slingshot-ignore-focus-lost into lp:~elementary-pantheon/slingshot/trunk

Proposed by Marcus Wichelmann on 2015-12-30
Status: Merged
Approved by: Daniel Fore on 2015-12-30
Approved revision: 620
Merged at revision: 620
Proposed branch: lp:~l-admin-3/slingshot/slingshot-ignore-focus-lost
Merge into: lp:~elementary-pantheon/slingshot/trunk
Diff against target: 23 lines (+0/-13)
1 file modified
src/SlingshotView.vala (+0/-13)
To merge this branch: bzr merge lp:~l-admin-3/slingshot/slingshot-ignore-focus-lost
Reviewer Review Type Date Requested Status
elementary Pantheon team 2015-12-30 Pending
Review via email: mp+281423@code.launchpad.net

Commit message

Let wingpanel handling the focus change

Description of the change

Slingshot doesn't need to check if another window has been selected because wingpanel does that now.

To post a comment you must log in.

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 2015-12-23 19:35:29 +0000
3+++ src/SlingshotView.vala 2015-12-30 11:22:34 +0000
4@@ -212,19 +212,6 @@
5 debug ("Ui setup completed");
6 }
7
8- public override bool button_press_event (Gdk.EventButton event) {
9- var pointer = Gdk.Display.get_default ().get_device_manager ().get_client_pointer ();
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- close_indicator ();
14-
15- return true;
16- }
17-
18- return false;
19- }
20-
21 private bool hotcorner_trigger (Gdk.EventMotion event) {
22 if (can_trigger_hotcorner && event.x_root <= 0 && event.y_root <= 0) {
23 Gdk.Display.get_default ().get_device_manager ().get_client_pointer ().ungrab (event.time);

Subscribers

People subscribed via source and target branches