Merge lp:~osomon/webbrowser-app/disable-webview-when-activityview-visible into lp:webbrowser-app

[Olivier Tilloy]

Disable the current webview while the activity view is visible, thus avoiding mouse events to go through.

[Günter Schwann (schwann)]

works fine

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:212
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/184/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/745
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/67
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/67
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/67/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/67
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/747
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/747/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/670

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/webbrowser-app-autolanding/99/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/751
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-autolanding/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-autolanding/43
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-autolanding/43/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-autolanding/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/753
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/753/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/676

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/Ubuntu/Components/Extras/Browser/ActivityView.qml'
--- src/Ubuntu/Components/Extras/Browser/ActivityView.qml	2013-07-04 11:37:16 +0000
+++ src/Ubuntu/Components/Extras/Browser/ActivityView.qml	2013-07-05 08:46:26 +0000
@@ -32,13 +32,6 @@
         }
     }
 
-    MouseArea {
-        // Prevent mouse/touch events from propagating to the webview below.
-        anchors.fill: parent
-        hoverEnabled: true
-        onWheel: {}
-    }
-
     Header {
         id: header
         title: tabs.selectedTab.title
 
=== modified file 'src/Ubuntu/Components/Extras/Browser/Browser.qml'
--- src/Ubuntu/Components/Extras/Browser/Browser.qml	2013-07-02 07:58:19 +0000
+++ src/Ubuntu/Components/Extras/Browser/Browser.qml	2013-07-05 08:46:26 +0000
@@ -277,6 +277,7 @@
 
             anchors.fill: parent
 
+            enabled: !activityView.visible
             visible: tabsModel.currentWebview === webview
 
             devicePixelRatio: browser.qtwebkitdpr