git.iko.soy/unity8
on xenial help sign in
disable spread interaction while locked (LP: #1641578)
57d1d88Michael Zanetti
qml/Shell.qml−2
compare with xenial
unifiedsplit
@@ -311,8 +311,6 @@ StyledItem {
311 keepDashRunning: launcher.shown || launcher.dashSwipe
311 keepDashRunning: launcher.shown || launcher.dashSwipe
312 altTabPressed: physicalKeysMapper.altTabPressed
312 altTabPressed: physicalKeysMapper.altTabPressed
313 oskEnabled: shell.oskEnabled
313 oskEnabled: shell.oskEnabled
314−
315− // TODO: This is not implemented yet in the new stage...
316 spreadEnabled: tutorial.spreadEnabled && (!greeter || (!greeter.hasLockedApp && !greeter.shown))
314 spreadEnabled: tutorial.spreadEnabled && (!greeter || (!greeter.hasLockedApp && !greeter.shown))
317 }
315 }
318 }
316 }
qml/Stage/Stage.qml+8−2
@@ -92,7 +92,9 @@ FocusScope {
92
92
93 onAltTabPressedChanged: {
93 onAltTabPressedChanged: {
94 if (altTabPressed) {
94 if (altTabPressed) {
95+ if (root.spreadEnabled) {
95− altTabDelayTimer.start();
96+ altTabDelayTimer.start();
97+ }
96 } else {
98 } else {
97 // Alt Tab has been released, did we already go to spread?
99 // Alt Tab has been released, did we already go to spread?
98 if (priv.goneToSpread) {
100 if (priv.goneToSpread) {
@@ -127,7 +129,9 @@ FocusScope {
127 function updateFocusedAppOrientation() { /* TODO */ }
129 function updateFocusedAppOrientation() { /* TODO */ }
128 function updateFocusedAppOrientationAnimated() { /* TODO */}
130 function updateFocusedAppOrientationAnimated() { /* TODO */}
129 function pushRightEdge(amount) {
131 function pushRightEdge(amount) {
132+ if (root.spreadEnabled) {
130− edgeBarrier.push(amount);
133+ edgeBarrier.push(amount);
134+ }
131 }
135 }
132
136
133 function closeSpread() {
137 function closeSpread() {
@@ -168,6 +172,7 @@ FocusScope {
168 GlobalShortcut {
172 GlobalShortcut {
169 id: showSpreadShortcut
173 id: showSpreadShortcut
170 shortcut: Qt.MetaModifier|Qt.Key_W
174 shortcut: Qt.MetaModifier|Qt.Key_W
175+ active: root.spreadEnabled
171 onTriggered: priv.goneToSpread = true
176 onTriggered: priv.goneToSpread = true
172 }
177 }
173
178
@@ -1800,6 +1805,7 @@ FocusScope {
1800 direction: Direction.Leftwards
1805 direction: Direction.Leftwards
1801 anchors { top: parent.top; right: parent.right; bottom: parent.bottom }
1806 anchors { top: parent.top; right: parent.right; bottom: parent.bottom }
1802 width: root.dragAreaWidth
1807 width: root.dragAreaWidth
1808+ enabled: root.spreadEnabled
1803
1809
1804 property var gesturePoints: []
1810 property var gesturePoints: []
1805 property bool cancelled: false
1811 property bool cancelled: false
tests/qmltests/tst_Shell.qml+46
@@ -2797,5 +2797,51 @@ Rectangle {
2797
2797
2798 GSettingsController.setEnableIndicatorMenu(true);
2798 GSettingsController.setEnableIndicatorMenu(true);
2799 }
2799 }
2800+
2801+ function test_spreadDisabled_data() {
2802+ return [
2803+ { tag: "enabled", spreadEnabled: true },
2804+ { tag: "disabled", spreadEnabled: false }
2805+ ];
2806+ }
2807+
2808+ function test_spreadDisabled(data) {
2809+ loadShell("phone");
2810+ swipeAwayGreeter();
2811+ var stage = findChild(shell, "stage");
2812+ stage.spreadEnabled = data.spreadEnabled;
2813+
2814+ // Try swiping
2815+ touchFlick(shell, shell.width - 2, shell.height / 2, units.gu(1), shell.height / 2);
2816+ tryCompare(stage, "state", data.spreadEnabled ? "spread" : "staged");
2817+
2818+ stage.closeSpread();
2819+ tryCompare(stage, "state", "staged");
2820+
2821+ // Try by edge push
2822+ mouseMove(stage, stage.width - 1, units.gu(10));
2823+ for (var i = 0; i < units.gu(10); i++) {
2824+ stage.pushRightEdge(1);
2825+ }
2826+ mouseMove(stage, stage.width - units.gu(5), units.gu(10));
2827+ tryCompare(stage, "state", data.spreadEnabled ? "spread" : "staged");
2828+
2829+ stage.closeSpread();
2830+ tryCompare(stage, "state", "staged");
2831+
2832+ // Try by alt+tab
2833+ keyPress(Qt.Key_Alt);
2834+ keyClick(Qt.Key_Tab);
2835+ tryCompare(stage, "state", data.spreadEnabled ? "spread" : "staged");
2836+ keyRelease(Qt.Key_Alt);
2837+
2838+ stage.closeSpread();
2839+ tryCompare(stage, "state", "staged");
2840+
2841+ // Try by Super+W
2842+ keyPress(Qt.Key_W, Qt.MetaModifier)
2843+ tryCompare(stage, "state", data.spreadEnabled ? "spread" : "staged");
2844+ keyRelease(Qt.Key_W, Qt.MetaModifier)
2845+ }
2800 }
2846 }
2801}
2847}