Merge lp:~cimi/unity8/elastic-not-close-spread into lp:unity8

[Andrea Cimitan]

Different drag behaviour for not closable apps in spread

 * Are there any related MPs required for this MP to build/function as expected? Please list.
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?
tomorrow morning

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1460
http://jenkins.qa.ubuntu.com/job/unity8-ci/4985/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/381
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/162
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/150
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/150
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/343
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/381
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/381/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16286

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

review: Needs Fixing (continuous-integration)

[lp:~cimi/unity8/elastic-not-close-spread]

1461. By Andrea Cimitan on 2014-11-27

Tweaked limit as design requested

1462. By Andrea Cimitan on 2014-11-27

Fix test

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1461
http://jenkins.qa.ubuntu.com/job/unity8-ci/4988/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/393/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/165
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/153
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/153
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/352/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/393
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/393/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16310

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

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

 * Did CI run pass?
Flacky unlrelated autopilot

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

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1462
http://jenkins.qa.ubuntu.com/job/unity8-ci/4989/
Executed test runs:
    ABORTED: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/394/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/166
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/154
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/154
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/394
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/394/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

=== modified file 'qml/Stages/SpreadDelegate.qml'
--- qml/Stages/SpreadDelegate.qml	2014-11-20 13:02:53 +0000
+++ qml/Stages/SpreadDelegate.qml	2014-11-27 11:22:18 +0000
@@ -41,10 +41,17 @@
     Item {
         objectName: "appWindowWithShadow"
 
-        y: dragArea.distance
+        readonly property real limit: root.height / 4
+
+        y: root.closeable ? dragArea.distance : elastic(dragArea.distance)
         width: parent.width
         height: parent.height
 
+        function elastic(distance) {
+            var k = distance < 0 ? -limit : limit
+            return k * (1 - Math.pow((k - 1) / k, distance))
+        }
+
         BorderImage {
             anchors {
                 fill: appWindow

=== modified file 'tests/qmltests/Stages/tst_SpreadDelegate.qml'
--- tests/qmltests/Stages/tst_SpreadDelegate.qml	2014-11-24 10:26:58 +0000
+++ tests/qmltests/Stages/tst_SpreadDelegate.qml	2014-11-27 11:22:18 +0000
@@ -110,7 +110,7 @@
                 {tag: "swipeToClose=true closeable=true -> appWindow moves away",
                  swipeToClose: true, closeable: true },
 
-                {tag: "swipeToClose=true closeable=alse -> appWindow bounces back",
+                {tag: "swipeToClose=true closeable=false -> appWindow bounces back",
                  swipeToClose: true, closeable: false },
 
                 {tag: "swipeToClose=false -> appWindow stays put",
@@ -134,13 +134,16 @@
                 touchX /* fromX */,  fromY, touchX /* toX */,  toY,
                 true /* beginTouch */, false /* endTouch */, dragArea.minSpeedToClose * 1.1 /* speed */);
 
-
             if (data.swipeToClose) {
                 verify(appWindowWithShadow.y < 0);
                 var threshold = findChild(spreadDelegateLoader.item, "dragArea").threshold
-                // Verify that the delegate started moving exactly "threshold" after the finger movement
-                // and did not jump up to the finger, but lags the threshold behind
-                compare(Math.abs(Math.abs(appWindowWithShadow.y) - dragDistance), threshold);
+                if (data.closeable) {
+                    // Verify that the delegate started moving exactly "threshold" after the finger movement
+                    // and did not jump up to the finger, but lags the threshold behind
+                    compare(Math.abs(Math.abs(appWindowWithShadow.y) - dragDistance), threshold);
+                } else {
+                    verify(Math.abs(Math.abs(appWindowWithShadow.y) - dragDistance) > threshold);
+                }
 
                 touchRelease(spreadDelegateLoader.item, touchX, toY - units.gu(1));