Merge lp:~mzanetti/unity8/disable-spread-while-locked-stable into lp:unity8/stable

[Michael Zanetti]

Hotfix for not allowing to go to spread when locked

[Lukáš Tinkl (lukas-kde)]

Change looks and works fine; tested on my krillin with mouse edge push, alt-tab and Meta+W keyboard shortcut

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

Yes

* Did CI run pass? If not, please explain why.

Not yet, will wait with the top approval

review: Approve

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2016-11-07 19:19:20 +0000
+++ qml/Shell.qml	2016-11-14 12:12:08 +0000
@@ -311,8 +311,6 @@
             keepDashRunning: launcher.shown || launcher.dashSwipe
             altTabPressed: physicalKeysMapper.altTabPressed
             oskEnabled: shell.oskEnabled
-
-            // TODO: This is not implemented yet in the new stage...
             spreadEnabled: tutorial.spreadEnabled && (!greeter || (!greeter.hasLockedApp && !greeter.shown))
         }
     }
 
=== modified file 'qml/Stage/Stage.qml'
--- qml/Stage/Stage.qml	2016-11-09 14:58:26 +0000
+++ qml/Stage/Stage.qml	2016-11-14 12:12:08 +0000
@@ -92,7 +92,9 @@
 
     onAltTabPressedChanged: {
         if (altTabPressed) {
-            altTabDelayTimer.start();
+            if (root.spreadEnabled) {
+                altTabDelayTimer.start();
+            }
         } else {
             // Alt Tab has been released, did we already go to spread?
             if (priv.goneToSpread) {
@@ -127,7 +129,9 @@
     function updateFocusedAppOrientation() { /* TODO */ }
     function updateFocusedAppOrientationAnimated() { /* TODO */}
     function pushRightEdge(amount) {
-        edgeBarrier.push(amount);
+        if (root.spreadEnabled) {
+            edgeBarrier.push(amount);
+        }
     }
 
     function closeSpread() {
@@ -168,6 +172,7 @@
     GlobalShortcut {
         id: showSpreadShortcut
         shortcut: Qt.MetaModifier|Qt.Key_W
+        active: root.spreadEnabled
         onTriggered: priv.goneToSpread = true
     }
 
@@ -1788,6 +1793,7 @@
         direction: Direction.Leftwards
         anchors { top: parent.top; right: parent.right; bottom: parent.bottom }
         width: root.dragAreaWidth
+        enabled: root.spreadEnabled
 
         property var gesturePoints: []
         property bool cancelled: false
 
=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2016-10-03 11:15:27 +0000
+++ tests/qmltests/tst_Shell.qml	2016-11-14 12:12:08 +0000
@@ -2761,5 +2761,51 @@
             wait(3000);
             tryCompare(cursor, "opacity", 0);
         }
+
+        function test_spreadDisabled_data() {
+            return [
+                { tag: "enabled", spreadEnabled: true },
+                { tag: "disabled", spreadEnabled: false }
+            ]
+        }
+        function test_spreadDisabled(data) {
+            loadShell("phone");
+            swipeAwayGreeter();
+            var stage = findChild(shell, "stage");
+            stage.spreadEnabled = data.spreadEnabled;
+
+            // Try swiping
+            touchFlick(shell, shell.width - 2, shell.height / 2, units.gu(1), shell.height / 2);
+            tryCompare(stage, "state", data.spreadEnabled ? "spread" : "staged");
+
+            stage.closeSpread();
+            tryCompare(stage, "state", "staged");
+
+            // Try by edge push
+            mouseMove(stage, stage.width -  1, units.gu(10));
+            for (var i = 0; i < units.gu(10); i++) {
+                stage.pushRightEdge(1);
+            }
+            mouseMove(stage, stage.width - units.gu(5), units.gu(10));
+            tryCompare(stage, "state", data.spreadEnabled ? "spread" : "staged");
+
+            stage.closeSpread();
+            tryCompare(stage, "state", "staged");
+
+            // Try by alt+tab
+            keyPress(Qt.Key_Alt);
+            keyClick(Qt.Key_Tab);
+            tryCompare(stage, "state", data.spreadEnabled ? "spread" : "staged");
+            keyRelease(Qt.Key_Alt);
+
+            stage.closeSpread();
+            tryCompare(stage, "state", "staged");
+
+            // Try by Super+W
+            keyPress(Qt.Key_W, Qt.MetaModifier)
+            tryCompare(stage, "state", data.spreadEnabled ? "spread" : "staged");
+            keyRelease(Qt.Key_W, Qt.MetaModifier)
+
+        }
     }
 }