git.iko.soy/unity8
on xenial help sign in
fixes left edge drag when in spread
c094449Michael Zanetti
qml/Stages/PhoneStage.qml+2−2
compare with xenial
unifiedsplit
@@ -52,7 +52,7 @@ Rectangle {
52 if (inverseProgress == 0 && priv.oldInverseProgress > 0) {
52 if (inverseProgress == 0 && priv.oldInverseProgress > 0) {
53 // left edge drag released. Minimum distance is given by design.
53 // left edge drag released. Minimum distance is given by design.
54 if (priv.oldInverseProgress > units.gu(22)) {
54 if (priv.oldInverseProgress > units.gu(22)) {
55− ApplicationManager.focusApplication("unity8-dash");
55+ ApplicationManager.requestFocusApplication("unity8-dash");
56 }
56 }
57 }
57 }
58 priv.oldInverseProgress = inverseProgress;
58 priv.oldInverseProgress = inverseProgress;
@@ -298,7 +298,7 @@ Rectangle {
298 x: {
298 x: {
299 // focused app is always positioned at 0 except when following left edge drag
299 // focused app is always positioned at 0 except when following left edge drag
300 if (index == 0) {
300 if (index == 0) {
301− if (!isDash && root.inverseProgress > 0) {
301+ if (!isDash && root.inverseProgress > 0 && spreadView.phase == 0) {
302 return root.inverseProgress;
302 return root.inverseProgress;
303 }
303 }
304 return 0;
304 return 0;
qml/Stages/TabletStage.qml+2−2
@@ -43,7 +43,7 @@ Rectangle {
43 if (inverseProgress == 0 && priv.oldInverseProgress > 0) {
43 if (inverseProgress == 0 && priv.oldInverseProgress > 0) {
44 // left edge drag released. Minimum distance is given by design.
44 // left edge drag released. Minimum distance is given by design.
45 if (priv.oldInverseProgress > units.gu(22)) {
45 if (priv.oldInverseProgress > units.gu(22)) {
46− ApplicationManager.focusApplication("unity8-dash");
46+ ApplicationManager.requestFocusApplication("unity8-dash");
47 }
47 }
48 }
48 }
49 priv.oldInverseProgress = inverseProgress;
49 priv.oldInverseProgress = inverseProgress;
@@ -492,7 +492,7 @@ Rectangle {
492 interactive: !spreadView.interactive && spreadView.phase === 0 && root.interactive
492 interactive: !spreadView.interactive && spreadView.phase === 0 && root.interactive
493 swipeToCloseEnabled: spreadView.interactive && !snapAnimation.running
493 swipeToCloseEnabled: spreadView.interactive && !snapAnimation.running
494 maximizedAppTopMargin: root.maximizedAppTopMargin
494 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
496 application: ApplicationManager.get(index)
496 application: ApplicationManager.get(index)
497 closeable: !isDash
497 closeable: !isDash
498
498