Merge lp:~tombeckmann/switchboard/focus-search into lp:~elementary-pantheon/switchboard/switchboard

[Tom Beckmann]

This redirects all input to the searchbox.

[Cody Garver (codygarver)]

Conflicts :(

review: Needs Fixing

[David Gomes (davidgomes)]

Disapproving, a new branch will be made.

review: Disapprove

Unmerged revisions

313. By Tom Beckmann on 2012-09-23

Redirect all input to the search box

=== modified file 'Switchboard/switchboard-app.vala'
--- Switchboard/switchboard-app.vala	2012-09-22 20:12:56 +0000
+++ Switchboard/switchboard-app.vala	2012-09-23 20:50:24 +0000
@@ -85,7 +85,7 @@
             main_window.icon_name = APP_ICON;
 
             // Set up window
-            main_window.set_size_request (842, 468);
+            main_window.set_size_request (822, 468);
             main_window.window_position = Gtk.WindowPosition.CENTER;
             main_window.destroy.connect (shut_down);
             setup_toolbar ();
@@ -196,6 +196,14 @@
                     return false;
                 });
             }
+            
+            main_window.key_press_event.connect ((event) => {
+            	if (main_window.get_focus () != search_box) {
+					search_box.grab_focus ();
+        		}
+        		
+        		return false;
+            });
         }
         
         bool draw_white (Cairo.Context cr) {