git.iko.soy/unity8
on xenial help sign in
fixes left edge drag when in spread

don't allow to drag an application to the left while in spread always focus the dash on long left edge swipes

commitc094449043487e96ec5dbed3fc26152f6833dc59 authorMichael Zanetti <michael.zanetti@canonical.com> dateTue 2 Dec 2014, 15:17 (12 years ago) parentbe59376
2 files changed+4−4
compare with xenial
unifiedsplit
qml/Stages/PhoneStage.qml+2−2 qml/Stages/TabletStage.qml+2−2
qml/Stages/PhoneStage.qml+2−2
@@ -52,7 +52,7 @@ Rectangle {
5252 if (inverseProgress == 0 && priv.oldInverseProgress > 0) {
5353 // left edge drag released. Minimum distance is given by design.
5454 if (priv.oldInverseProgress > units.gu(22)) {
55− ApplicationManager.focusApplication("unity8-dash");
55+ ApplicationManager.requestFocusApplication("unity8-dash");
5656 }
5757 }
5858 priv.oldInverseProgress = inverseProgress;
@@ -298,7 +298,7 @@ Rectangle {
298298 x: {
299299 // focused app is always positioned at 0 except when following left edge drag
300300 if (index == 0) {
301− if (!isDash && root.inverseProgress > 0) {
301+ if (!isDash && root.inverseProgress > 0 && spreadView.phase == 0) {
302302 return root.inverseProgress;
303303 }
304304 return 0;
qml/Stages/TabletStage.qml+2−2
@@ -43,7 +43,7 @@ Rectangle {
4343 if (inverseProgress == 0 && priv.oldInverseProgress > 0) {
4444 // left edge drag released. Minimum distance is given by design.
4545 if (priv.oldInverseProgress > units.gu(22)) {
46− ApplicationManager.focusApplication("unity8-dash");
46+ ApplicationManager.requestFocusApplication("unity8-dash");
4747 }
4848 }
4949 priv.oldInverseProgress = inverseProgress;
@@ -492,7 +492,7 @@ Rectangle {
492492 interactive: !spreadView.interactive && spreadView.phase === 0 && root.interactive
493493 swipeToCloseEnabled: spreadView.interactive && !snapAnimation.running
494494 maximizedAppTopMargin: root.maximizedAppTopMargin
495− dragOffset: !isDash && model.appId == priv.mainStageAppId && root.inverseProgress > 0 ? root.inverseProgress : 0
495+ dragOffset: !isDash && model.appId == priv.mainStageAppId && root.inverseProgress > 0 && spreadView.phase ==0 ? root.inverseProgress : 0
496496 application: ApplicationManager.get(index)
497497 closeable: !isDash
498498