on xenial help sign in
always close the spread on left edge swipe
commit8197a722b9ce1dc8ad9f3672a894b0ef7e01beef authorMichael Zanetti <michael.zanetti@canonical.com> dateMon 7 Nov 2016, 20:19 (10 years ago) parent601c54c
2 files changed+7−2
qml/Shell.qml+2−1 qml/Stage/Stage.qml+5−1
qml/Shell.qml+2−1
@@ -442,9 +442,10 @@ StyledItem {
442442 }
443443
444444 if (!greeter.locked && tutorial.launcherLongSwipeEnabled
445− && ApplicationManager.focusedApplicationId != "unity8-dash") {
445+ && (ApplicationManager.focusedApplicationId != "unity8-dash" || stage.spreadShown)) {
446446 ApplicationManager.requestFocusApplication("unity8-dash")
447447 launcher.fadeOut();
448+ stage.closeSpread();
448449 }
449450 }
450451
qml/Stage/Stage.qml+5−1
@@ -53,12 +53,12 @@ FocusScope {
5353 property real leftEdgeDragProgress: 0
5454
5555 // Used by the tutorial code
56− readonly property bool spreadShown: state == "spread"
5756 readonly property real rightEdgeDragProgress: rightEdgeDragArea.progress // How far left the stage has been dragged
5857
5958 // used by the snap windows (edge maximize) feature
6059 readonly property alias previewRectangle: fakeRectangle
6160
61+ readonly property bool spreadShown: state == "spread"
6262 readonly property var mainApp: priv.focusedAppDelegate ? priv.focusedAppDelegate.application : null
6363
6464 // application windows never rotate independently
@@ -105,6 +105,10 @@ FocusScope {
105105 edgeBarrier.push(amount);
106106 }
107107
108+ function closeSpread() {
109+ priv.goneToSpread = false;
110+ }
111+
108112 onSpreadEnabledChanged: {
109113 if (!spreadEnabled && root.state == "spread") {
110114 priv.goneToSpread = false;