Merge lp:~osomon/webbrowser-app/preview-grid-fixes into lp:webbrowser-app

[Olivier Tilloy]

Fixes for minor UX issues with the preview grid:
 - Make the highlight follow the item selected for deletion in the preview grid.
 - Do not show a highlight in the narrow version of the new tab view, as it doesn’t support keyboard navigation.
 - Grab dismiss area events so that they are not propagated to the view below when dismissing a context menu.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1239
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2362/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4673
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1116/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1116
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1116/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1116
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3771
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4670
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4670/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24280

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

review: Needs Fixing (continuous-integration)

=== modified file 'src/app/webbrowser/NewTabView.qml'
--- src/app/webbrowser/NewTabView.qml	2015-10-12 12:00:35 +0000
+++ src/app/webbrowser/NewTabView.qml	2015-10-16 07:57:34 +0000
@@ -301,6 +301,9 @@
                     visible: opacity > 0
                     interactive: false
 
+                    // No highlight as this view doesn’t support keyboard navigation
+                    highlight: null
+
                     model: LimitProxyModel {
                         limit: 10
                         sourceModel: topSitesModel

=== modified file 'src/app/webbrowser/UrlPreviewDelegate.qml'
--- src/app/webbrowser/UrlPreviewDelegate.qml	2015-10-12 10:25:07 +0000
+++ src/app/webbrowser/UrlPreviewDelegate.qml	2015-10-16 07:57:34 +0000
@@ -34,9 +34,10 @@
     property alias previewHeight: previewShape.height
     property alias previewWidth: previewShape.width
 
+    signal setCurrent()
     signal removed()
 
-    onPressAndHold: PopupUtils.open(contextMenuComponent, previewShape)
+    onPressAndHold: previewShape.openContextMenu()
 
     Column {
         id: contentColumn
@@ -99,18 +100,24 @@
                     previewImage.source = previewShape.previewUrl
                 }
             }
+
+            function openContextMenu() {
+                preview.setCurrent()
+                PopupUtils.open(contextMenuComponent, previewShape)
+            }
         }
     }
 
     MouseArea {
         anchors.fill: contentColumn
         acceptedButtons: Qt.RightButton
-        onClicked: PopupUtils.open(contextMenuComponent, previewShape)
+        onClicked: previewShape.openContextMenu()
     }
 
     Component {
         id: contextMenuComponent
         ActionSelectionPopover {
+            grabDismissAreaEvents: true
             actions: ActionList {
                 Action {
                     objectName: "delete"

=== modified file 'src/app/webbrowser/UrlPreviewGrid.qml'
--- src/app/webbrowser/UrlPreviewGrid.qml	2015-10-08 14:42:23 +0000
+++ src/app/webbrowser/UrlPreviewGrid.qml	2015-10-16 07:57:34 +0000
@@ -56,6 +56,7 @@
         previewWidth: grid.previewWidth
 
         onClicked: grid.activated(model.url)
+        onSetCurrent: grid.currentIndex = index
         onRemoved: grid.removed(model.url)
     }