@@ -58,20 +58,20 @@ SpreadDelegate {
5858
5959 Connections {
6060 target: spreadView
61− onStageChanged: {
62− if (spreadView.stage == 1) {
61+ onPhaseChanged: {
62+ if (spreadView.phase == 1) {
6363 if (index == 0) {
64− priv.stage2startTranslate = priv.easingAnimation(0, spreadView.positionMarker4, 0, -spreadView.width, spreadView.positionMarker4) + spreadView.width;
65− priv.stage2startAngle = priv.easingAnimation(0, spreadView.positionMarker4, root.startAngle, root.endAngle, spreadView.positionMarker4);
66− priv.stage2startScale = priv.easingAnimation(0, spreadView.positionMarker4, root.startScale, root.endScale, spreadView.positionMarker4);
67− priv.stage2startTopMarginProgress = priv.easingAnimation(0, 1, 0, 1, spreadView.positionMarker4);
64+ priv.phase2startTranslate = priv.easingAnimation(0, spreadView.positionMarker4, 0, -spreadView.width, spreadView.positionMarker4) + spreadView.width;
65+ priv.phase2startAngle = priv.easingAnimation(0, spreadView.positionMarker4, root.startAngle, root.endAngle, spreadView.positionMarker4);
66+ priv.phase2startScale = priv.easingAnimation(0, spreadView.positionMarker4, root.startScale, root.endScale, spreadView.positionMarker4);
67+ priv.phase2startTopMarginProgress = priv.easingAnimation(0, 1, 0, 1, spreadView.positionMarker4);
6868 } else if (index == 1) {
69− // find where the main easing for Tile 1 would be when reaching stage 2
70− var stage2Progress = spreadView.positionMarker4 - spreadView.tileDistance / spreadView.width;
71− priv.stage2startTranslate = priv.easingAnimation(0, stage2Progress, 0, -spreadView.width + root.endDistance, stage2Progress);
72− priv.stage2startAngle = priv.easingAnimation(0, stage2Progress, root.startAngle, root.endAngle, stage2Progress);
73− priv.stage2startScale = priv.easingAnimation(0, stage2Progress, root.startScale, root.endScale, stage2Progress);
74− priv.stage2startTopMarginProgress = priv.easingAnimation(0, 1, 0, spreadView.positionMarker4, stage2Progress);
69+ // find where the main easing for Tile 1 would be when reaching phase 2
70+ var phase2Progress = spreadView.positionMarker4 - spreadView.tileDistance / spreadView.width;
71+ priv.phase2startTranslate = priv.easingAnimation(0, phase2Progress, 0, -spreadView.width + root.endDistance, phase2Progress);
72+ priv.phase2startAngle = priv.easingAnimation(0, phase2Progress, root.startAngle, root.endAngle, phase2Progress);
73+ priv.phase2startScale = priv.easingAnimation(0, phase2Progress, root.startScale, root.endScale, phase2Progress);
74+ priv.phase2startTopMarginProgress = priv.easingAnimation(0, 1, 0, spreadView.positionMarker4, phase2Progress);
7575 }
7676 }
7777 }
@@ -88,12 +88,12 @@ SpreadDelegate {
8888 property real selectedOpacity
8989 property real selectedTopMarginProgress
9090
91− // Those values are needed as target values for the end of stage 1.
92− // As they are static values, lets caluclate them once when entering stage 1 instead of calculating them in each animation pass.
93− property real stage2startTranslate
94− property real stage2startAngle
95− property real stage2startScale
96− property real stage2startTopMarginProgress
91+ // Those values are needed as target values for the end of phase 1.
92+ // As they are static values, lets caluclate them once when entering phase 1 instead of calculating them in each animation pass.
93+ property real phase2startTranslate
94+ property real phase2startAngle
95+ property real phase2startScale
96+ property real phase2startTopMarginProgress
9797
9898 function snapshot() {
9999 selectedProgress = root.progress;
@@ -106,7 +106,7 @@ SpreadDelegate {
106106 }
107107
108108 property real negativeProgress: {
109− if (index == 1 && spreadView.stage < 2) {
109+ if (index == 1 && spreadView.phase < 2) {
110110 return 0;
111111 }
112112 return -index * spreadView.tileDistance / spreadView.width;
@@ -127,7 +127,7 @@ SpreadDelegate {
127127
128128 property real xTranslate: {
129129 if (otherSelected) {
130− if (spreadView.stage < 2 && index == 0) {
130+ if (spreadView.phase < 2 && index == 0) {
131131 return linearAnimation(selectedProgress, negativeProgress, selectedXTranslate, selectedXTranslate - spreadView.tileDistance, root.progress);
132132 }
133133
@@ -136,13 +136,13 @@ SpreadDelegate {
136136
137137 switch (index) {
138138 case 0:
139− if (spreadView.stage == 0) {
139+ if (spreadView.phase == 0) {
140140 return Math.min(0, linearAnimation(0, spreadView.positionMarker2,
141141 0, -spreadView.width * .25, root.animatedProgress));
142− } else if (spreadView.stage == 1){
142+ } else if (spreadView.phase == 1){
143143 return linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4,
144− -spreadView.width * .25, priv.stage2startTranslate, root.progress);
145− } else if (!priv.isSelected){ // Stage 2
144+ -spreadView.width * .25, priv.phase2startTranslate, root.progress);
145+ } else if (!priv.isSelected){ // phase 2
146146 // Apply the same animation as with the rest but add spreadView.width to align it with the others.
147147 return -easingCurve.value * spreadView.width + spreadView.width;
148148 } else if (priv.isSelected) {
@@ -150,12 +150,12 @@ SpreadDelegate {
150150 }
151151
152152 case 1:
153− if (spreadView.stage == 0 && !priv.isSelected) {
153+ if (spreadView.phase == 0 && !priv.isSelected) {
154154 return linearAnimation(0, spreadView.positionMarker2,
155155 0, -spreadView.width * spreadView.snapPosition, root.animatedProgress);
156− } else if (spreadView.stage == 1 && !priv.isSelected) {
156+ } else if (spreadView.phase == 1 && !priv.isSelected) {
157157 return linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4,
158− -spreadView.width * spreadView.snapPosition, priv.stage2startTranslate,
158+ -spreadView.width * spreadView.snapPosition, priv.phase2startTranslate,
159159 root.progress);
160160 }
161161 }
@@ -183,20 +183,20 @@ SpreadDelegate {
183183 }
184184 switch (index) {
185185 case 0:
186− if (spreadView.stage == 0) {
186+ if (spreadView.phase == 0) {
187187 return Math.max(0, linearAnimation(0, spreadView.positionMarker2,
188188 0, root.tile0SnapAngle, root.animatedProgress));
189− } else if (spreadView.stage == 1) {
189+ } else if (spreadView.phase == 1) {
190190 return linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4,
191− root.tile0SnapAngle, stage2startAngle, root.progress);
191+ root.tile0SnapAngle, phase2startAngle, root.progress);
192192 }
193193 case 1:
194− if (spreadView.stage == 0) {
194+ if (spreadView.phase == 0) {
195195 return linearAnimation(0, spreadView.positionMarker2, root.startAngle,
196196 root.startAngle * (1-spreadView.snapPosition), root.animatedProgress);
197− } else if (spreadView.stage == 1) {
197+ } else if (spreadView.phase == 1) {
198198 return linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4,
199− root.startAngle * (1-spreadView.snapPosition), priv.stage2startAngle,
199+ root.startAngle * (1-spreadView.snapPosition), priv.phase2startAngle,
200200 root.progress);
201201 }
202202 }
@@ -213,21 +213,21 @@ SpreadDelegate {
213213
214214 switch (index) {
215215 case 0:
216− if (spreadView.stage == 0) {
216+ if (spreadView.phase == 0) {
217217 return 1;
218− } else if(spreadView.stage == 1) {
218+ } else if(spreadView.phase == 1) {
219219 return linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4,
220− 1, stage2startScale, root.progress);
220+ 1, phase2startScale, root.progress);
221221 }
222222 case 1:
223− if (spreadView.stage == 0) {
223+ if (spreadView.phase == 0) {
224224 var targetScale = tile1StartScale - ((tile1StartScale - 1) * spreadView.snapPosition);
225225 return linearAnimation(0, spreadView.positionMarker2,
226226 root.tile1StartScale, targetScale, root.animatedProgress);
227− } else if (spreadView.stage == 1) {
227+ } else if (spreadView.phase == 1) {
228228 var startScale = tile1StartScale - ((tile1StartScale - 1) * spreadView.snapPosition);
229229 return linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4,
230− startScale, priv.stage2startScale, root.progress);
230+ startScale, priv.phase2startScale, root.progress);
231231 }
232232 }
233233 return root.startScale - easingCurve.value * (root.startScale - root.endScale);
@@ -239,7 +239,7 @@ SpreadDelegate {
239239 selectedOpacity, 0, root.progress);
240240 }
241241 if (index == 0) {
242− switch (spreadView.stage) {
242+ switch (spreadView.phase) {
243243 case 0:
244244 return linearAnimation(0, spreadView.positionMarker2, 1, .3, root.animatedProgress);
245245 case 1:
@@ -258,19 +258,19 @@ SpreadDelegate {
258258
259259 switch (index) {
260260 case 0:
261− if (spreadView.stage == 0) {
261+ if (spreadView.phase == 0) {
262262 return 0;
263− } else if (spreadView.stage == 1) {
263+ } else if (spreadView.phase == 1) {
264264 return linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4,
265− 0, priv.stage2startTopMarginProgress, root.progress);
265+ 0, priv.phase2startTopMarginProgress, root.progress);
266266 }
267267 break;
268268 case 1:
269− if (spreadView.stage == 0) {
269+ if (spreadView.phase == 0) {
270270 return 0;
271− } else if (spreadView.stage == 1) {
271+ } else if (spreadView.phase == 1) {
272272 return linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4,
273− 0, priv.stage2startTopMarginProgress, root.progress);
273+ 0, priv.phase2startTopMarginProgress, root.progress);
274274 }
275275 }
276276