Merge lp:~aacid/unity8/dash_disable_hswipe_on_vswipe into lp:unity8

[Albert Astals Cid]

Don't let the user change between scopes if the current one is moving up/down

[Mirco Müller (macslow)]

Looks fine to me, merges ok and fixes the issue.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:435
http://jenkins.qa.ubuntu.com/job/unity8-ci/1360/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4939/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2835
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2226
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/383
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1360
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1360/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1359
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1116/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/814
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/814/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2837
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2837/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2359
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2399

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1360/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'Dash/DashContent.qml'
--- Dash/DashContent.qml	2013-10-08 11:10:11 +0000
+++ Dash/DashContent.qml	2013-10-11 10:08:39 +0000
@@ -83,7 +83,7 @@
         id: dashContentList
         objectName: "dashContentList"
 
-        interactive: dashContent.scopes.loaded
+        interactive: dashContent.scopes.loaded && !currentItem.previewShown && !currentItem.moving
 
         anchors.fill: parent
         model: dashContent.model
@@ -116,6 +116,9 @@
                 source: scopeMapper.map(scope.id)
                 objectName: scope.id + " loader"
 
+                readonly property bool previewShown: item.previewShown
+                readonly property bool moving: item.moving
+
                 // these are needed for autopilot tests
                 readonly property string scopeId: scope.id
                 readonly property bool isCurrent: ListView.isCurrentItem
@@ -135,10 +138,7 @@
                     onEndReached: contentEndReached()
                     onPreviewShownChanged: {
                         if (item.previewShown) {
-                            previewShown()
-                            dashContentList.interactive = false
-                        } else {
-                            dashContentList.interactive = true
+                            dashContent.previewShown()
                         }
                     }
                 }

=== modified file 'Dash/GenericScopeView.qml'
--- Dash/GenericScopeView.qml	2013-10-11 08:43:01 +0000
+++ Dash/GenericScopeView.qml	2013-10-11 10:08:39 +0000
@@ -24,6 +24,8 @@
     readonly property alias previewShown: previewLoader.onScreen
     property bool enableHeightBehaviorOnNextCreation: false
 
+    moving: categoryView.moving
+
     onIsCurrentChanged: {
         pageHeader.resetSearch();
         previewLoader.open = false;

=== modified file 'Dash/ScopeView.qml'
--- Dash/ScopeView.qml	2013-09-24 09:52:37 +0000
+++ Dash/ScopeView.qml	2013-10-11 10:08:39 +0000
@@ -23,6 +23,7 @@
     property SortFilterProxyModel categories: categoryFilter
     property bool isCurrent
     property ListModel searchHistory
+    property bool moving: false
 
     signal endReached
     signal movementStarted