Merge lp:~tombeckmann/slingshot/focus-issues into lp:~elementary-pantheon/slingshot/trunk

Proposed by Tom Beckmann
Status: Merged
Merged at revision: 311
Proposed branch: lp:~tombeckmann/slingshot/focus-issues
Merge into: lp:~elementary-pantheon/slingshot/trunk
Diff against target: 26 lines (+11/-2)
1 file modified
src/SlingshotView.vala (+11/-2)
To merge this branch: bzr merge lp:~tombeckmann/slingshot/focus-issues
Reviewer Review Type Date Requested Status
Andrea Basso (community) Approve
Review via email: mp+141238@code.launchpad.net

Description of the change

In gala we no longer focus windows on every map, so we need to readd the wnck activation in order to make keyboard input possible again.

To post a comment you must log in.
Revision history for this message
Andrea Basso (voluntatefaber) :
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 2012-11-04 15:25:09 +0000
3+++ src/SlingshotView.vala 2012-12-25 15:55:24 +0000
4@@ -593,12 +593,21 @@
5
6 reposition ();
7 show_all ();
8+ present ();
9
10- show_all ();
11 set_focus(null);
12 searchbar.grab_focus ();
13 set_modality ((Modality) view_selector.selected);
14- }
15+
16+ while (Gtk.events_pending ())
17+ Gtk.main_iteration ();
18+
19+ var xid = Gdk.X11Window.get_xid (this.get_window ());
20+ var w = Wnck.Window.get (xid);
21+ Wnck.Screen.get_default ().force_update ();
22+ if (w != null)
23+ w.activate (Gdk.x11_get_server_time (this.get_window ()));
24+ }
25
26 private void page_left (int step = 1) {
27

Subscribers

People subscribed via source and target branches