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

[Albert Astals Cid]

Disable Dash horizontal scroll while Navigation InverseMouseArea is pressed

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

[lp:~aacid/unity8/departmentListHorizontalScroll]

1525. By Albert Astals Cid on 2015-01-05

test for flick when navigation open

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1524
http://jenkins.qa.ubuntu.com/job/unity8-ci/5075/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/648
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/239
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/240
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/240
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/557
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/646
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/646/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16801

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5075/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1525
http://jenkins.qa.ubuntu.com/job/unity8-ci/5076/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/649
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/240
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/241
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/241
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/558
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/647
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/647/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16805

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5076/rebuild

review: Needs Fixing (continuous-integration)

[lp:~aacid/unity8/departmentListHorizontalScroll]

1526. By Albert Astals Cid on 2015-01-07

give it some margins

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1526
http://jenkins.qa.ubuntu.com/job/unity8-ci/5081/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/679
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/245/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/246
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/246
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/584
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/677
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/677/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16859

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5081/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1526
http://jenkins.qa.ubuntu.com/job/unity8-ci/5082/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/681
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/246
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/247
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/247
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/586
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/679
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/679/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16862

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5082/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1526
http://jenkins.qa.ubuntu.com/job/unity8-ci/5087/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/687
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/251
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/252
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/252
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/592
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/685
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/685/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16874

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5087/rebuild

review: Approve (continuous-integration)

[lp:~aacid/unity8/departmentListHorizontalScroll]

1527. By Albert Astals Cid on 2015-01-07

Merge lp:~aacid/unity8/waitForRenderingNoCrash

1528. By Albert Astals Cid on 2015-01-08

Merge

Unmerged revisions

=== modified file 'qml/Dash/DashContent.qml'
--- qml/Dash/DashContent.qml	2014-12-15 22:42:44 +0000
+++ qml/Dash/DashContent.qml	2015-01-07 08:28:27 +0000
@@ -113,7 +113,7 @@
             objectName: "dashContentList"
 
             interactive: !dashContent.forceNonInteractive && dashContent.scopes.loaded && currentItem
-                      && !currentItem.moving && !currentItem.navigationShown && !currentItem.subPageShown
+                      && !currentItem.moving && !currentItem.navigationDisableParentInteractive && !currentItem.subPageShown
             anchors.fill: parent
             orientation: ListView.Horizontal
             boundsBehavior: Flickable.DragAndOvershootBounds
@@ -175,7 +175,7 @@
                     objectName: "scopeLoader" + index
 
                     readonly property bool moving: item ? item.moving : false
-                    readonly property bool navigationShown: item ? item.navigationShown : false
+                    readonly property bool navigationDisableParentInteractive: item ? item.navigationDisableParentInteractive : false
                     readonly property bool subPageShown: item ? item.subPageShown : false
                     readonly property var categoryView: item ? item.categoryView : null
                     readonly property var theScope: scope

=== modified file 'qml/Dash/DashNavigation.qml'
--- qml/Dash/DashNavigation.qml	2014-09-25 15:46:28 +0000
+++ qml/Dash/DashNavigation.qml	2015-01-07 08:28:27 +0000
@@ -33,6 +33,10 @@
         if (altNavigationButton.showList) return altNavigationButton.listView;
         return null;
     }
+    readonly property bool disableParentInteractive: {
+        return navigationButton.showList || altNavigationButton.showList ||
+               navigationButton.inverseMousePressed || altNavigationButton.inverseMousePressed;
+    }
 
     // FIXME this is only here for highlight purposes (see Background.qml, too)
     readonly property var background: backgroundItem

=== modified file 'qml/Dash/DashNavigationButton.qml'
--- qml/Dash/DashNavigationButton.qml	2014-12-15 12:39:00 +0000
+++ qml/Dash/DashNavigationButton.qml	2015-01-07 08:28:27 +0000
@@ -31,6 +31,7 @@
     // Used by parent
     readonly property var currentNavigation: scope && scope[hasNavigation] ? getNavigation(scope[currentNavigationId]) : null
     readonly property alias listView: navigationListView
+    readonly property bool inverseMousePressed: inverseMouseArea.pressed
     property bool showList: false
 
     // Internal
@@ -210,6 +211,7 @@
     onCurrentNavigationChanged: setNewNavigation();
 
     InverseMouseArea {
+        id: inverseMouseArea
         anchors.fill: navigationListView
         enabled: root.showList
         onPressed: root.showList = false

=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2014-12-15 22:42:11 +0000
+++ qml/Dash/GenericScopeView.qml	2015-01-07 08:28:27 +0000
@@ -25,7 +25,7 @@
 FocusScope {
     id: scopeView
 
-    readonly property bool navigationShown: pageHeaderLoader.item ? pageHeaderLoader.item.bottomItem[0].openList : false
+    readonly property bool navigationDisableParentInteractive: pageHeaderLoader.item ? pageHeaderLoader.item.bottomItem[0].disableParentInteractive : false
     property bool forceNonInteractive: false
     property var scope: null
     property SortFilterProxyModel categories: categoryFilter

=== modified file 'tests/qmltests/Dash/tst_DashContent.qml'
--- tests/qmltests/Dash/tst_DashContent.qml	2014-12-15 14:06:38 +0000
+++ tests/qmltests/Dash/tst_DashContent.qml	2015-01-07 08:28:27 +0000
@@ -505,6 +505,27 @@
             compare(dashAltNavigationButton.showList, false);
         }
 
+        function test_navigationsSwipeToNextScope() {
+            var dashContentList = findChild(dashContent, "dashContentList");
+            tryCompareFunction(function() { return findChild(dashContentList.currentItem, "dashNavigation") != null; }, true);
+            var dashNavigation = findChild(dashContentList.currentItem, "dashNavigation");
+            tryCompare(dashNavigation, "visible", true);
+            var dashNavigationButton = findChild(dashContentList.currentItem, "altNavigationButton");
+            verify(dashNavigationButton, "Can't find navigation button");
+
+            compare(dashNavigationButton.showList, false);
+            waitForRendering(dashNavigationButton);
+            mouseClick(dashNavigationButton, 0, 0);
+            compare(dashNavigationButton.showList, true);
+
+            mouseFlick(dashNavigationButton, dashNavigationButton.width - units.gu(1), units.gu(1), units.gu(1), units.gu(1));
+            compare(dashNavigationButton.showList, false);
+
+            var dashContentList = findChild(dashContent, "dashContentList");
+            expectFail("", "should not change the parent list.");
+            tryCompare(dashContentList, "currentIndex", 1);
+        }
+
         function test_searchHint() {
             var dashContentList = findChild(dashContent, "dashContentList");
             verify(dashContentList !== null);