Merge lp:~osomon/webbrowser-app/focus-fix-suggestions-list into lp:webbrowser-app

Proposed by Olivier Tilloy
Status: Merged
Approved by: Ugo Riboni
Approved revision: 155
Merged at revision: 154
Proposed branch: lp:~osomon/webbrowser-app/focus-fix-suggestions-list
Merge into: lp:webbrowser-app
Diff against target: 24 lines (+5/-1)
2 files modified
src/Ubuntu/Browser/Browser.qml (+4/-1)
tests/autopilot/webbrowser_app/tests/test_history.py (+1/-0)
To merge this branch: bzr merge lp:~osomon/webbrowser-app/focus-fix-suggestions-list
Reviewer Review Type Date Requested Status
Ugo Riboni (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+166862@code.launchpad.net

Commit message

Transfer focus to the webview when validating an entry from the suggestions list.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Ugo Riboni (uriboni) wrote :

Code looks good and tests pass, also manually confirmed on desktop.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Ubuntu/Browser/Browser.qml'
2--- src/Ubuntu/Browser/Browser.qml 2013-05-31 16:55:20 +0000
3+++ src/Ubuntu/Browser/Browser.qml 2013-05-31 17:48:26 +0000
4@@ -359,7 +359,10 @@
5 }
6 width: panel.width - units.gu(5)
7 height: Math.min(contentHeight, panel.y - units.gu(2))
8- onSelected: browser.url = url
9+ onSelected: {
10+ browser.url = url
11+ webview.forceActiveFocus()
12+ }
13 }
14
15 KeyboardRectangle {
16
17=== modified file 'tests/autopilot/webbrowser_app/tests/test_history.py'
18--- tests/autopilot/webbrowser_app/tests/test_history.py 2013-05-31 09:06:19 +0000
19+++ tests/autopilot/webbrowser_app/tests/test_history.py 2013-05-31 17:48:26 +0000
20@@ -131,3 +131,4 @@
21 webview = self.main_window.get_web_view()
22 url = "http://en.wikipedia.org/wiki/Ubuntu_(operating_system)"
23 self.assertThat(webview.url, Eventually(Equals(url)))
24+ self.assertThat(suggestions.visible, Eventually(Equals(False)))

Subscribers

People subscribed via source and target branches

to status/vote changes: