Merge lp:~kalikiana/midori/stayfocussed into lp:midori

[Cris Dywan]

Consistently focus urlbar or view

[gue5t gue5t (gue5t)]

Maintaining UI consistency and predictability is awesome, but there's one nitpick here: if the view grabs focus in midori_view_notify_load_status_cb, any time the user stops a page load, or the load finishes, focus will jump to the page even if the user is actively entering a new URI.

Unmerged revisions

6481. By Cris Dywan on 2013-11-17

Consistently focus urlbar or view

=== modified file 'midori/midori-app.c'
--- midori/midori-app.c	2013-09-07 20:38:45 +0000
+++ midori/midori-app.c	2013-11-17 00:49:37 +0000
@@ -501,7 +501,6 @@
         MidoriBrowser* browser = midori_app_create_browser (app);
         midori_app_add_browser (app, browser);
         midori_browser_add_uri (browser, "about:home");
-        midori_browser_activate_action (browser, "Location");
         gtk_widget_show (GTK_WIDGET (browser));
         midori_app_raise_window (GTK_WINDOW (browser), NULL);
         return;
 
=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2013-11-15 02:25:36 +0000
+++ midori/midori-browser.c	2013-11-17 00:49:37 +0000
@@ -695,6 +695,8 @@
         /* Focus the urlbar on blank pages */
         if (midori_view_is_blank (view))
             midori_browser_activate_action (browser, "Location");
+        else
+            gtk_widget_grab_focus (GTK_WIDGET (view));
     }
 
     g_object_notify (G_OBJECT (browser), "load-status");
@@ -7704,6 +7706,8 @@
     #else
     gtk_notebook_set_current_page (GTK_NOTEBOOK (browser->notebook), n);
     #endif
+
+    /* Focus the urlbar on blank pages */
     if (midori_view_is_blank (MIDORI_VIEW (view)))
         midori_browser_activate_action (browser, "Location");
     else