git.iko.soy/unity8
on xenial help sign in
improve transitions between stages
a8eb860Michael Zanetti
qml/Stages/PhoneStage.qml+1−1
compare with xenial
unifiedsplit
@@ -359,7 +359,7 @@ Item {
359 id: appDelegate
359 id: appDelegate
360 startAngle: 45
360 startAngle: 45
361 endAngle: 5
361 endAngle: 5
362− startScale: 1
362+ startScale: 1.2
363 endScale: 0.6
363 endScale: 0.6
364 startDistance: spreadView.tileDistance
364 startDistance: spreadView.tileDistance
365 endDistance: units.gu(.5)
365 endDistance: units.gu(.5)
qml/Stages/TransformedSpreadDelegate.qml+4−2
@@ -188,10 +188,12 @@ SpreadDelegate {
188 }
188 }
189 case 1:
189 case 1:
190 if (spreadView.stage == 0 && !priv.isSelected) {
190 if (spreadView.stage == 0 && !priv.isSelected) {
191+ var targetScale = tile1StartScale - ((tile1StartScale - 1) * spreadView.snapPosition);
191− newScale = linearAnimation(0, spreadView.positionMarker2, root.tile1StartScale, 1, root.animatedProgress)
192+ newScale = linearAnimation(0, spreadView.positionMarker2, root.tile1StartScale, targetScale, root.animatedProgress)
192 break;
193 break;
193 } else if (spreadView.stage == 1 && !priv.isSelected) {
194 } else if (spreadView.stage == 1 && !priv.isSelected) {
195+ var startScale = tile1StartScale - ((tile1StartScale - 1) * spreadView.snapPosition);
194− newScale = linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4, 1, priv.stage2startScale, root.progress)
196+ newScale = linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4, startScale, priv.stage2startScale, root.progress)
195 break;
197 break;
196 }
198 }
197
199