Merge lp:~osomon/webbrowser-app/keyboard-shortcut-fixes into lp:webbrowser-app

[Olivier Tilloy]

Fix multiple keyboard focus/shortcut issues.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1297
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2509/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5596
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1263
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1263
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1263/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1263
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4378
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5610
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5610/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25813

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2509/rebuild

review: Approve (continuous-integration)

=== modified file 'src/app/webbrowser/Browser.qml'
--- src/app/webbrowser/Browser.qml	2015-11-26 11:59:33 +0000
+++ src/app/webbrowser/Browser.qml	2015-12-04 10:53:31 +0000
@@ -572,7 +572,7 @@
         Keys.onDownPressed: {
             if (suggestionsList.count) suggestionsList.focus = true
             else if (newTabViewLoader.status == Loader.Ready) {
-                newTabViewLoader.focus = true
+                newTabViewLoader.forceActiveFocus()
             }
         }
 
@@ -753,6 +753,13 @@
 
         Keys.onEscapePressed: bookmarksViewLoader.active = false
 
+        onActiveChanged: {
+            if (active) {
+                chrome.findInPageMode = false
+                forceActiveFocus()
+            }
+        }
+
         Connections {
             target: bookmarksViewLoader.item
 
@@ -806,7 +813,12 @@
 
         Keys.onEscapePressed: historyViewLoader.active = false
 
-        onActiveChanged: if (active) chrome.findInPageMode = false
+        onActiveChanged: {
+            if (active) {
+                chrome.findInPageMode = false
+                forceActiveFocus()
+            }
+        }
 
         Component {
             id: historyViewComponent

=== modified file 'src/app/webbrowser/HistoryViewWide.qml'
--- src/app/webbrowser/HistoryViewWide.qml	2015-10-15 19:09:59 +0000
+++ src/app/webbrowser/HistoryViewWide.qml	2015-12-04 10:53:31 +0000
@@ -45,10 +45,8 @@
     Keys.onPressed: {
         if (event.modifiers === Qt.ControlModifier && event.key === Qt.Key_F) {
             if (searchMode) searchQuery.focus = true
-            else {
-                if (!selectMode) searchMode = true
-                else event.accepted = true
-            }
+            else if (!selectMode) searchMode = true
+            event.accepted = true
         }
     }
     Keys.onDeletePressed: {

=== modified file 'tests/autopilot/webbrowser_app/emulators/browser.py'
--- tests/autopilot/webbrowser_app/emulators/browser.py	2015-11-26 13:42:12 +0000
+++ tests/autopilot/webbrowser_app/emulators/browser.py	2015-12-04 10:53:31 +0000
@@ -523,6 +523,9 @@
         return sorted(self.select_many("UrlDelegate"),
                       key=lambda item: item.globalRect.y)
 
+    def get_search_field(self):
+        return self.select_single(objectName="searchQuery")
+
 
 class ExpandedHistoryView(uitk.UbuntuUIToolkitCustomProxyObjectBase):
 

=== modified file 'tests/autopilot/webbrowser_app/tests/test_keyboard.py'
--- tests/autopilot/webbrowser_app/tests/test_keyboard.py	2015-11-11 16:03:56 +0000
+++ tests/autopilot/webbrowser_app/tests/test_keyboard.py	2015-12-04 10:53:31 +0000
@@ -345,6 +345,61 @@
         new_tab_view = self.main_window.get_new_tab_view()
         self.assertThat(new_tab_view.visible, Eventually(Equals(True)))
 
+    def test_search_in_history(self):
+        if not self.main_window.wide:
+            self.skipTest("Only on wide form factors")
+
+        self.assertThat(self.main_window.get_history_view(), Equals(None))
+        self.main_window.press_key('Ctrl+h')
+        self.assertThat(lambda: self.main_window.get_history_view(),
+                        Eventually(NotEquals(None)))
+        history_view = self.main_window.get_history_view()
+
+        self.main_window.press_key('Ctrl+f')
+        self.assertThat(history_view.searchMode, Eventually(Equals(True)))
+        search_field = history_view.get_search_field()
+        self.assertThat(search_field.visible, Equals(True))
+        self.assertThat(search_field.activeFocus, Eventually(Equals(True)))
+
+        self.main_window.press_key('Escape')
+        self.assertThat(history_view.searchMode, Eventually(Equals(False)))
+        self.assertThat(search_field.visible, Equals(False))
+
+        self.main_window.press_key('Escape')
+        history_view.wait_until_destroyed()
+
+    def test_open_history_exits_findinpage(self):
+        address_bar = self.main_window.chrome.address_bar
+        self.main_window.press_key('Ctrl+f')
+        self.assertThat(address_bar.findInPageMode, Eventually(Equals(True)))
+        self.assertThat(address_bar.activeFocus, Eventually(Equals(True)))
+
+        self.main_window.press_key('Ctrl+h')
+        self.assertThat(lambda: self.main_window.get_history_view(),
+                        Eventually(NotEquals(None)))
+        history_view = self.main_window.get_history_view()
+        self.assertThat(address_bar.findInPageMode, Eventually(Equals(False)))
+        self.assertThat(address_bar.activeFocus, Eventually(Equals(False)))
+
+        self.main_window.press_key('Escape')
+        history_view.wait_until_destroyed()
+
+    def test_open_bookmarks_exits_findinpage(self):
+        address_bar = self.main_window.chrome.address_bar
+        self.main_window.press_key('Ctrl+f')
+        self.assertThat(address_bar.findInPageMode, Eventually(Equals(True)))
+        self.assertThat(address_bar.activeFocus, Eventually(Equals(True)))
+
+        self.main_window.press_key('Ctrl+Shift+o')
+        self.assertThat(lambda: self.main_window.get_bookmarks_view(),
+                        Eventually(NotEquals(None)))
+        bookmarks_view = self.main_window.get_bookmarks_view()
+        self.assertThat(address_bar.findInPageMode, Eventually(Equals(False)))
+        self.assertThat(address_bar.activeFocus, Eventually(Equals(False)))
+
+        self.main_window.press_key('Escape')
+        bookmarks_view.wait_until_destroyed()
+
     def test_escape_settings(self):
         settings = self.open_settings()
         self.main_window.press_key('Escape')
@@ -364,3 +419,21 @@
         self.open_new_tab()
         self.main_window.press_key('Ctrl+f')
         self.assertThat(address_bar.findInPageMode, Equals(False))
+
+    def test_navigate_between_address_bar_and_new_tab_view(self):
+        if not self.main_window.wide:
+            self.skipTest("Only on wide form factors")
+
+        address_bar = self.main_window.chrome.address_bar
+
+        self.main_window.press_key('Ctrl+t')
+        new_tab_view = self.main_window.get_new_tab_view()
+        self.assertThat(address_bar.activeFocus, Eventually(Equals(True)))
+
+        self.main_window.press_key('Down')
+        self.assertThat(address_bar.activeFocus, Eventually(Equals(False)))
+        self.assertThat(new_tab_view.activeFocus, Eventually(Equals(True)))
+
+        self.main_window.press_key('Up')
+        self.assertThat(new_tab_view.activeFocus, Eventually(Equals(False)))
+        self.assertThat(address_bar.activeFocus, Eventually(Equals(True)))