git.iko.soy/unity8
on xenial help sign in
improve transitions between stages
commita8eb860586cbced6160aa793de79564786dafb22 authorMichael Zanetti <michael.zanetti@canonical.com> dateFri 31 Jan 2014, 00:42 (13 years ago) parent4031f8d
2 files changed+5−3
compare with xenial
unifiedsplit
qml/Stages/PhoneStage.qml+1−1 qml/Stages/TransformedSpreadDelegate.qml+4−2
qml/Stages/PhoneStage.qml+1−1
@@ -359,7 +359,7 @@ Item {
359359 id: appDelegate
360360 startAngle: 45
361361 endAngle: 5
362− startScale: 1
362+ startScale: 1.2
363363 endScale: 0.6
364364 startDistance: spreadView.tileDistance
365365 endDistance: units.gu(.5)
qml/Stages/TransformedSpreadDelegate.qml+4−2
@@ -188,10 +188,12 @@ SpreadDelegate {
188188 }
189189 case 1:
190190 if (spreadView.stage == 0 && !priv.isSelected) {
191− newScale = linearAnimation(0, spreadView.positionMarker2, root.tile1StartScale, 1, root.animatedProgress)
191+ var targetScale = tile1StartScale - ((tile1StartScale - 1) * spreadView.snapPosition);
192+ newScale = linearAnimation(0, spreadView.positionMarker2, root.tile1StartScale, targetScale, root.animatedProgress)
192193 break;
193194 } else if (spreadView.stage == 1 && !priv.isSelected) {
194− newScale = linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4, 1, priv.stage2startScale, root.progress)
195+ var startScale = tile1StartScale - ((tile1StartScale - 1) * spreadView.snapPosition);
196+ newScale = linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4, startScale, priv.stage2startScale, root.progress)
195197 break;
196198 }
197199