Merge lp:~jaapz-b/switchboard/fix-1014707 into lp:~elementary-pantheon/switchboard/switchboard

[Jaap Broekhuizen]

[Victor Martinez (victored)]

This code also grabs key presses when modifier keys are active, which means that using desktop shortcuts while the Switchboard's window is active will also move focus to the search entry. I'd suggest doing the following:

var modifiers = Gtk.accelerator_get_default_mod_mask ();
bool modifiers_active = (event.state & modifiers) != 0;

if (!modifiers_active) {
    [... run proposed code ...]
}

Diff line 10 could be replaced by "search_box.has_focus"

The rest looks perfect to me.

review: Needs Fixing

[lp:~jaapz-b/switchboard/fix-1014707]

343. By Jaap Broekhuizen on 2012-11-24

Check for modifier keys.

=== modified file 'Switchboard/switchboard-app.vala'
--- Switchboard/switchboard-app.vala	2012-11-24 14:20:29 +0000
+++ Switchboard/switchboard-app.vala	2012-11-24 15:18:19 +0000
@@ -490,6 +490,15 @@
             var find_toolitem = new Gtk.ToolItem ();
             find_toolitem.add(search_box);
 
+            // Focus typing to the search bar
+            main_window.key_press_event.connect ((event) => {
+                // Don't focus if it is a modifier or if search_box is already focused.
+                if ((event.is_modifier == 0) && !search_box.has_focus)
+                    search_box.grab_focus ();
+
+                return false;
+            });
+
             // Nav button
             navigation_button = new Gtk.ToolButton.from_stock(Gtk.Stock.GO_BACK);
             navigation_button.clicked.connect (handle_navigation_button_clicked);