git.iko.soy/unity8
on xenial help sign in
more fixes to the side stage animation
b0fbd77Michael Zanetti
qml/Stage/Spread/StagedRightEdgeMaths.qml+2−2
compare with xenial
unifiedsplit
@@ -131,7 +131,7 @@ QtObject {
131
131
132
132
133 if (progress < breakPoint) {
133 if (progress < breakPoint) {
134− if (itemIndex == nextInStack && sideStageOpen) {
134+ if (itemIndex == nextInStack && (sideStageOpen || stage == ApplicationInfoInterface.MainStage)) {
135 return MathUtils.linearAnimation(0, 1, startAngle, targetAngle, progress);
135 return MathUtils.linearAnimation(0, 1, startAngle, targetAngle, progress);
136 } else {
136 } else {
137 return 0;
137 return 0;
@@ -160,7 +160,7 @@ QtObject {
160 }
160 }
161
161
162 if (progress < breakPoint) {
162 if (progress < breakPoint) {
163− if (itemIndex == nextInStack && sideStageOpen) {
163+ if (itemIndex == nextInStack && (sideStageOpen || stage == ApplicationInfoInterface.MainStage)) {
164 return MathUtils.linearAnimation(0, 1, startScale, targetScale, progress);
164 return MathUtils.linearAnimation(0, 1, startScale, targetScale, progress);
165 }
165 }
166 return startScale;
166 return startScale;