Merge lp:~mzanetti/unity8/mouse-activated-staged-spreads into lp:unity8

[Michael Zanetti]

Allow invoking the staged mode spreads by mouse right edge pushes too

The reason why this isn't in AbstractStage is because the spreads work too different between the staged and the windowed mode.

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

nope

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

yip yip

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

yeeha

 * 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

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2206
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/491/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/655
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay/218
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial/218
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/678
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/696
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/696
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/692
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/692/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/692
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/692/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/692
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/692/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/692
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/692/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/692
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/692/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/692
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/692/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/491/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2206
http://jenkins.qa.ubuntu.com/job/unity8-ci/7420/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6638
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/835/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/2125
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/828
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/2020
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/2020
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/827
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/826
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5040
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6649
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6649/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27899
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/432/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/833
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/833/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27898

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

review: Needs Fixing (continuous-integration)

[Josh Arenson (josharenson)]

Being nit-picky, but could you add parenthesis to your math (lines 30, 79)?
Otherwise, looks good and tests well.

review: Needs Fixing

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2207
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/608/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/340
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial,testname=qmluitests.sh/340
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=autopilot.sh/340
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/799
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/815
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/815
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/813
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/813/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/813
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/813/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/813
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/813/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/813
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/813/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/813
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/813/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/813
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/813/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/608/rebuild

review: Needs Fixing (continuous-integration)

[Josh Arenson (josharenson)]

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

 * Did CI run pass?
It is "yellow"

 * Did you make sure that the branch does not contain spurious tags?
Yes, clean.

review: Approve

[Michael Zanetti (mzanetti)]

approving as per superseded

review: Approve

=== modified file 'qml/Stages/PhoneStage.qml'
--- qml/Stages/PhoneStage.qml	2016-01-14 13:03:20 +0000
+++ qml/Stages/PhoneStage.qml	2016-03-10 11:59:10 +0000
@@ -74,6 +74,12 @@
         }
     }
 
+    function pushRightEdge(amount) {
+        if (spreadView.contentX == -spreadView.shift) {
+            edgeBarrier.push(amount);
+        }
+    }
+
     mainApp: applicationManager.focusedApplicationId
             ? applicationManager.findApplication(applicationManager.focusedApplicationId)
             : null
@@ -651,4 +657,31 @@
             }
         }
     }
+
+    EdgeBarrier {
+        id: edgeBarrier
+
+        // NB: it does its own positioning according to the specified edge
+        edge: Qt.RightEdge
+
+        onPassed: {
+            // Add 1 pixel to make sure we definitely hit positionMarker4 even with rounding errors of the animation.
+            snapAnimation.targetContentX = (root.width * spreadView.positionMarker4) + 1 - spreadView.shift;
+            snapAnimation.start();
+        }
+        material: Component {
+            Item {
+                Rectangle {
+                    width: parent.height
+                    height: parent.width
+                    rotation: 90
+                    anchors.centerIn: parent
+                    gradient: Gradient {
+                        GradientStop { position: 0.0; color: Qt.rgba(0.16,0.16,0.16,0.7)}
+                        GradientStop { position: 1.0; color: Qt.rgba(0.16,0.16,0.16,0)}
+                    }
+                }
+            }
+        }
+    }
 }

=== modified file 'qml/Stages/TabletStage.qml'
--- qml/Stages/TabletStage.qml	2016-01-14 13:03:20 +0000
+++ qml/Stages/TabletStage.qml	2016-03-10 11:59:10 +0000
@@ -70,6 +70,12 @@
         }
     }
 
+    function pushRightEdge(amount) {
+        if (spreadView.contentX == -spreadView.shift) {
+            edgeBarrier.push(amount);
+        }
+    }
+
     orientationChangesEnabled: priv.mainAppOrientationChangesEnabled
 
     supportedOrientations: mainApp ? mainApp.supportedOrientations
@@ -805,4 +811,31 @@
             }
         }
     }
+
+    EdgeBarrier {
+        id: edgeBarrier
+
+        // NB: it does its own positioning according to the specified edge
+        edge: Qt.RightEdge
+
+        onPassed: {
+            // Add 1 pixel to make sure we definitely hit positionMarker4 even with rounding errors of the animation.
+            snapAnimation.targetContentX = (root.width * spreadView.positionMarker4) + 1 - spreadView.shift;
+            snapAnimation.start();
+        }
+        material: Component {
+            Item {
+                Rectangle {
+                    width: parent.height
+                    height: parent.width
+                    rotation: 90
+                    anchors.centerIn: parent
+                    gradient: Gradient {
+                        GradientStop { position: 0.0; color: Qt.rgba(0.16,0.16,0.16,0.7)}
+                        GradientStop { position: 1.0; color: Qt.rgba(0.16,0.16,0.16,0)}
+                    }
+                }
+            }
+        }
+    }
 }

=== modified file 'tests/qmltests/Stages/tst_PhoneStage.qml'
--- tests/qmltests/Stages/tst_PhoneStage.qml	2015-11-25 13:33:42 +0000
+++ tests/qmltests/Stages/tst_PhoneStage.qml	2016-03-10 11:59:10 +0000
@@ -40,12 +40,6 @@
         orientations: Orientations {}
     }
 
-    Binding {
-        target: ApplicationManager
-        property: "rightMargin"
-        value: phoneStage.anchors.rightMargin
-    }
-
     Rectangle {
         anchors { fill: parent; leftMargin: phoneStage.width }
 
@@ -77,6 +71,15 @@
                     ApplicationManager.get(appList.selectedAppIndex).setState(ApplicationInfoInterface.Stopped);
                 }
             }
+            EdgeBarrierControls {
+                id: edgeBarrierControls
+                text: "Drag here to pull out spread"
+                backgroundColor: "blue"
+                onDragged: { phoneStage.pushRightEdge(amount); }
+                Component.onCompleted: {
+                    edgeBarrierControls.target = testCase.findChild(phoneStage, "edgeBarrierController");
+                }
+            }
         }
         ListView {
             id: appList
@@ -463,5 +466,15 @@
 
             tryCompare(delegate.application, "requestedState", ApplicationInfoInterface.RequestedRunning);
         }
+
+        function test_mouseEdgePush() {
+            var spreadView = findChild(phoneStage, "spreadView")
+            addApps(1);
+            mouseMove(phoneStage, phoneStage.width -  1, units.gu(10));
+            for (var i = 0; i < units.gu(10); i++) {
+                phoneStage.pushRightEdge(1);
+            }
+            tryCompare(spreadView, "phase", 2);
+        }
     }
 }

=== modified file 'tests/qmltests/Stages/tst_TabletStage.qml'
--- tests/qmltests/Stages/tst_TabletStage.qml	2015-12-01 12:17:24 +0000
+++ tests/qmltests/Stages/tst_TabletStage.qml	2016-03-10 11:59:10 +0000
@@ -21,6 +21,7 @@
 import Unity.Application 0.1
 import Unity.Test 0.1
 
+import ".."
 import "../../../qml/Stages"
 import "../../../qml/Components"
 
@@ -77,6 +78,15 @@
         Column {
             anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
             spacing: units.gu(1)
+            EdgeBarrierControls {
+                id: edgeBarrierControls
+                text: "Drag here to pull out spread"
+                backgroundColor: "blue"
+                onDragged: { tabletStageLoader.item.pushRightEdge(amount); }
+                Component.onCompleted: {
+                    edgeBarrierControls.target = testCase.findChild(tabletStageLoader, "edgeBarrierController");
+                }
+            }
             ApplicationCheckBox {
                 id: webbrowserCheckBox
                 appId: "webbrowser-app"
@@ -365,6 +375,14 @@
             tryCompare(webbrowserApp, "requestedState", ApplicationInfoInterface.RequestedRunning);
             tryCompare(dialerApp, "requestedState", ApplicationInfoInterface.RequestedRunning);
         }
+
+        function test_mouseEdgePush() {
+            var spreadView = findChild(tabletStageLoader, "spreadView")
+            mouseMove(tabletStageLoader, tabletStageLoader.width -  1, units.gu(10));
+            for (var i = 0; i < units.gu(10); i++) {
+                tabletStageLoader.item.pushRightEdge(1);
+            }
+            tryCompare(spreadView, "phase", 2);
+        }
     }
-
 }