Merge lp:~unity-team/unity8/rtm-14.09-staging into lp:unity8/rtm-14.09

[Michael Zanetti]

Backport fixes to RTM

- Bug #1368287
- Bug #1394208

[lp:~unity-team/unity8/rtm-14.09-staging]

1419. By Andrea Cimitan on 2014-12-16

Different drag behaviour for not closable apps in spread

=== modified file 'qml/Stages/SpreadDelegate.qml'
--- qml/Stages/SpreadDelegate.qml	2014-09-19 11:20:07 +0000
+++ qml/Stages/SpreadDelegate.qml	2014-12-16 22:08:28 +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/mocks/Unity/Application/ApplicationManager.cpp'
--- tests/mocks/Unity/Application/ApplicationManager.cpp	2014-09-29 09:54:30 +0000
+++ tests/mocks/Unity/Application/ApplicationManager.cpp	2014-12-16 22:08:28 +0000
@@ -20,6 +20,7 @@
 #include "ApplicationTestInterface.h"
 
 #include <paths.h>
+#include <csignal>
 
 #include <QDir>
 #include <QGuiApplication>
@@ -36,6 +37,12 @@
 {
     if (!the_application_manager) {
         the_application_manager = new ApplicationManager();
+
+        // Emit signal to notify Upstart that Mir is ready to receive client connections
+        // see http://upstart.ubuntu.com/cookbook/#expect-stop
+        if (qgetenv("UNITY_MIR_EMITS_SIGSTOP") == "1") {
+            raise(SIGSTOP);
+        }
     }
     return the_application_manager;
 }
 
=== modified file 'tests/qmltests/Stages/tst_SpreadDelegate.qml'
--- tests/qmltests/Stages/tst_SpreadDelegate.qml	2014-08-13 19:50:09 +0000
+++ tests/qmltests/Stages/tst_SpreadDelegate.qml	2014-12-16 22:08:28 +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,10 +134,15 @@
                 touchX /* fromX */,  fromY, touchX /* toX */,  toY,
                 true /* beginTouch */, false /* endTouch */, dragArea.minSpeedToClose * 1.1 /* speed */);
 
-
             if (data.swipeToClose) {
                 verify(appWindowWithShadow.y < 0);
-                verify(Math.abs(Math.abs(appWindowWithShadow.y) - dragDistance) < units.gu(1));
+                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
+                    verify(Math.abs(Math.abs(appWindowWithShadow.y) - dragDistance) < units.gu(1));
+                } else {
+                    verify(Math.abs(Math.abs(appWindowWithShadow.y) - dragDistance) > units.gu(1));
+                }
 
                 touchRelease(spreadDelegateLoader.item, touchX, toY - units.gu(1));