git.iko.soy/unity8
on xenial help sign in
finetune scaling
commite3f9656b13342cb6d104336231e173213d9a9844 authorMichael Zanetti <michael.zanetti@canonical.com> dateTue 28 Jan 2014, 21:06 (13 years ago) parent7ffaa00
2 files changed+13−20
compare with xenial
unifiedsplit
qml/Stages/PhoneStage.qml+7−7 qml/Stages/TransformedSpreadDelegate.qml+6−13
qml/Stages/PhoneStage.qml+7−7
@@ -206,10 +206,10 @@ Item {
206206 if (dragging && !priv.waitingForScreenshot && attachedToView) {
207207 spreadView.contentX = -touchX
208208 }
209− if (attachedToView && spreadView.contentX >= spreadView.width * spreadView.positionMarker3) {
210− attachedToView = false;
211− spreadView.snap();
212− }
209+// if (attachedToView && spreadView.contentX >= spreadView.width * spreadView.positionMarker3) {
210+// attachedToView = false;
211+// spreadView.snap();
212+// }
213213 }
214214
215215 onDraggingChanged: {
@@ -250,7 +250,7 @@ Item {
250250
251251 // Stage of the animation:
252252 // 0: Starting from right edge, a new app (index 1) comes in from the right
253− // 1: The app has reached the first snap position
253+ // 1: The app has reached the first snap position.
254254 // 2: The list is dragged further and snaps into the spread view when entering stage 2
255255 property int stage: 0
256256
@@ -330,8 +330,8 @@ Item {
330330 delegate: TransformedSpreadDelegate {
331331 startAngle: 45
332332 endAngle: 10
333− startScale: 1.4
334− endScale: 0.8
333+ startScale: 1
334+ endScale: 0.7
335335 startDistance: spreadView.tileDistance
336336 endDistance: units.gu(.5)
337337
qml/Stages/TransformedSpreadDelegate.qml+6−13
@@ -14,6 +14,7 @@ SpreadDelegate {
1414
1515 property real startScale: 1
1616 property real endScale: 1
17+ property real tile1StartScale: startScale + .4
1718
1819 property real startDistance: units.gu(5)
1920 property real endDistance: units.gu(.5)
@@ -210,36 +211,28 @@ SpreadDelegate {
210211 case 0:
211212 if (spreadView.stage == 0) {
212213 newScale = 1;
214+ break
213215 } else if(spreadView.stage == 1) {
214216 var progress = root.progress - spreadView.positionMarker2
215217 var progressDiff = spreadView.positionMarker4 - spreadView.positionMarker2
216218 var scaleDiff = 1 - root.endScale;
217219 // progress : progressDiff = angle : angleDiff
218220 newScale = 1 - (progress * scaleDiff / progressDiff);
219−
220− } else {
221− var progress = root.progress - spreadView.positionMarker2;
222− var scaleDiff = 1 - root.endScale;
223− var progressDiff = 1 - spreadView.positionMarker2;
224− // progress : progressDiff = angle : angleDiff
225− newScale = 1 - (progress * scaleDiff / progressDiff);
226− newScale = Math.max(root.endScale, newScale);
221+ break;
227222 }
228−
229− break;
230223 case 1:
231224 if (spreadView.stage == 0) {
232225 var progress = root.animatedProgress;
233226 var progressDiff = spreadView.positionMarker2;
234− var scaleDiff = (root.startScale - 1) * spreadView.snapPosition
227+ var scaleDiff = (root.tile1StartScale - 1) * spreadView.snapPosition
235228
236229 // progress : progressDiff = angle : angleDiff
237230 var scaleTranslate = progress * scaleDiff / progressDiff;
238231
239− newScale = root.startScale - scaleTranslate;
232+ newScale = root.tile1StartScale - scaleTranslate;
240233 break;
241234 } else if (spreadView.stage == 1) {
242− var stage0Scale = root.startScale - (root.startScale - 1) * spreadView.snapPosition
235+ var stage0Scale = root.tile1StartScale - (root.tile1StartScale - 1) * spreadView.snapPosition
243236
244237 var progress = root.progress
245238 var progressDiff = spreadView.positionMarker4 - spreadView.positionMarker2