location bar at end of toolbar, still default focus

1 files changed, 8 insertions, 5 deletions

diff --git a/badwolf.c b/badwolf.c
index d03d735..849d6aa 100644
--- a/badwolf.c
+++ b/badwolf.c
@@ -597,11 +597,6 @@ new_browser(struct Window *window, const gchar *target_url, WebKitWebView *relat
 	gtk_widget_set_tooltip_text(browser->auto_load_images, _("Toggle loading images automatically"));
 
 	gtk_box_pack_start(GTK_BOX(browser->toolbar),
-	                   GTK_WIDGET(browser->location),
-	                   TRUE,
-	                   TRUE,
-	                   BADWOLF_TOOLBAR_PADDING);
-	gtk_box_pack_start(GTK_BOX(browser->toolbar),
 	                   GTK_WIDGET(browser->javascript),
 	                   FALSE,
 	                   FALSE,
@@ -611,6 +606,14 @@ new_browser(struct Window *window, const gchar *target_url, WebKitWebView *relat
 	                   FALSE,
 	                   FALSE,
 	                   BADWOLF_TOOLBAR_PADDING);
+	gtk_box_pack_start(GTK_BOX(browser->toolbar),
+	                   GTK_WIDGET(browser->location),
+	                   TRUE,
+	                   TRUE,
+	                   BADWOLF_TOOLBAR_PADDING);
+
+	gtk_container_set_focus_child(GTK_CONTAINER(browser->box), browser->toolbar);
+	gtk_container_set_focus_child(GTK_CONTAINER(browser->toolbar), browser->location);
 
 	gtk_box_pack_start(
 	    GTK_BOX(browser->box), GTK_WIDGET(browser->toolbar), FALSE, FALSE, BADWOLF_BOX_PADDING);