Midori Web Browser

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

  1. stayfocussed
  2. Merge into trunk
Proposed by Cris Dywan
Status: Work in progress
Proposed branch: lp:~kalikiana/midori/stayfocussed
Merge into: lp:midori
Diff against target: 33 lines (+4/-1)
2 files modified
midori/midori-app.c (+0/-1)
midori/midori-browser.c (+4/-0)
To merge this branch: bzr merge lp:~kalikiana/midori/stayfocussed
Reviewer Review Type Date Requested Status
Midori Devs Pending
Review via email: mp+195494@code.launchpad.net

Commit message

Consistently focus urlbar or view

To post a comment you must log in.
Revision history for this message
gue5t gue5t (gue5t) wrote :

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.

Reply

Unmerged revisions

6481. By Cris Dywan

Consistently focus urlbar or view

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'midori/midori-app.c'
2--- midori/midori-app.c 2013-09-07 20:38:45 +0000
3+++ midori/midori-app.c 2013-11-17 00:49:37 +0000
4@@ -501,7 +501,6 @@
5 MidoriBrowser* browser = midori_app_create_browser (app);
6 midori_app_add_browser (app, browser);
7 midori_browser_add_uri (browser, "about:home");
8- midori_browser_activate_action (browser, "Location");
9 gtk_widget_show (GTK_WIDGET (browser));
10 midori_app_raise_window (GTK_WINDOW (browser), NULL);
11 return;
12
13=== modified file 'midori/midori-browser.c'
14--- midori/midori-browser.c 2013-11-15 02:25:36 +0000
15+++ midori/midori-browser.c 2013-11-17 00:49:37 +0000
16@@ -695,6 +695,8 @@
17 /* Focus the urlbar on blank pages */
18 if (midori_view_is_blank (view))
19 midori_browser_activate_action (browser, "Location");
20+ else
21+ gtk_widget_grab_focus (GTK_WIDGET (view));
22 }
23
24 g_object_notify (G_OBJECT (browser), "load-status");
25@@ -7704,6 +7706,8 @@
26 #else
27 gtk_notebook_set_current_page (GTK_NOTEBOOK (browser->notebook), n);
28 #endif
29+
30+ /* Focus the urlbar on blank pages */
31 if (midori_view_is_blank (MIDORI_VIEW (view)))
32 midori_browser_activate_action (browser, "Location");
33 else

Subscribers

People subscribed via source and target branches

to all changes: