on xenial help sign in
fix angle in right edge drag
commit5e20875922bf2cf02b732e91d1f8084bd106b47f authorMichael Zanetti <michael.zanetti@canonical.com> dateThu 22 Sep 2016, 18:15 (10 years ago) parent7353dc3
1 file changed+6−8
qml/Stage/Spread/StagedRightEdgeMaths.qml+6−8
qml/Stage/Spread/StagedRightEdgeMaths.qml+6−8
@@ -129,16 +129,14 @@ QtObject {
129129 }
130130 }
131131
132+ if ((itemIndex == nextInStack)
133+ || (isMainStageApp && nextStage === ApplicationInfoInterface.MainStage)
134+ || (isSideStageApp && nextStage === ApplicationInfoInterface.SideStage)) {
135+ return MathUtils.linearAnimation(0, 1, startAngle, targetAngle, progress);
136+ }
132137
133138 if (progress < breakPoint) {
134− if (itemIndex == nextInStack && (sideStageOpen || stage == ApplicationInfoInterface.MainStage)) {
135− return MathUtils.linearAnimation(0, 1, startAngle, targetAngle, progress);
136− } else {
137− return 0;
138− }
139− }
140− if (itemIndex == nextInStack) {
141− return MathUtils.linearAnimation(0, 1, startAngle, targetAngle, progress);
139+ return 0;
142140 }
143141 return MathUtils.linearAnimation(breakPoint, 1, startAngle, targetAngle, progress);
144142 }