@@ -64,9 +64,9 @@ SpreadDelegate {
6464 if (spreadView.phase == 1) {
6565 var phase2Progress = spreadView.positionMarker4 - (root.zIndex * spreadView.tileDistance / spreadView.width);
6666 priv.phase2StartTranslate = priv.easingAnimation(0, 1, 0, -spreadView.width + (root.zIndex * root.endDistance), phase2Progress);
67− priv.phase2StartScale = priv.easingAnimation(0, 1, root.startScale, root.endScale, phase2Progress)
68− priv.phase2StartAngle = priv.easingAnimation(0, 1, root.startAngle, root.endAngle, phase2Progress)
69− priv.phase2StartTopMarginProgress = priv.easingAnimation(0, 1, 0, 1, phase2Progress)
67+ priv.phase2StartScale = priv.easingAnimation(0, 1, root.startScale, root.endScale, phase2Progress);
68+ priv.phase2StartAngle = priv.easingAnimation(0, 1, root.startAngle, root.endAngle, phase2Progress);
69+ priv.phase2StartTopMarginProgress = priv.easingAnimation(0, 1, 0, 1, phase2Progress);
7070 }
7171 }
7272 }
@@ -129,27 +129,27 @@ SpreadDelegate {
129129 var newTranslate = 0;
130130
131131 if (otherSelected) {
132− return priv.selectedXTranslate
132+ return priv.selectedXTranslate;
133133 }
134134
135135 if (isSelected) {
136136 if (model.stage == ApplicationInfoInterface.MainStage) {
137− return linearAnimation(selectedProgress, negativeProgress, selectedXTranslate, -spreadView.width, root.progress)
137+ return linearAnimation(selectedProgress, negativeProgress, selectedXTranslate, -spreadView.width, root.progress);
138138 } else {
139− return linearAnimation(selectedProgress, negativeProgress, selectedXTranslate, -spreadView.sideStageWidth, root.progress)
139+ return linearAnimation(selectedProgress, negativeProgress, selectedXTranslate, -spreadView.sideStageWidth, root.progress);
140140 }
141141 }
142142
143143 // The tile should move a bit to the left if a new one comes on top of it, but not for the Side Stage and not
144144 // when we're only dragging the side stage in on top of a main stage app
145145 var shouldMoveAway = spreadView.nextInStack >= 0 && priv.movedActive && model.stage === ApplicationInfoInterface.MainStage &&
146− ApplicationManager.get(spreadView.nextInStack).stage === ApplicationInfoInterface.MainStage
146+ ApplicationManager.get(spreadView.nextInStack).stage === ApplicationInfoInterface.MainStage;
147147
148148 if (active) {
149149 newTranslate -= root.width
150150 // Only do the hide animation for active apps in the mainstage, and not if we only drag the ss in
151151 if (spreadView.phase == 0 && shouldMoveAway) {
152− newTranslate += linearAnimation(0, spreadView.positionMarker2, 0, -units.gu(4), root.animatedProgress)
152+ newTranslate += linearAnimation(0, spreadView.positionMarker2, 0, -units.gu(4), root.animatedProgress);
153153 }
154154 }
155155 if (nextInStack && spreadView.phase == 0) {
@@ -162,16 +162,16 @@ SpreadDelegate {
162162
163163 if (model.stage == ApplicationInfoInterface.SideStage && !spreadView.sideStageVisible) {
164164 // This is when we only drag the side stage in, without rotation or snapping
165− newTranslate = linearAnimation(0, spreadView.positionMarker2, 0, -spreadView.sideStageWidth, root.progress)
165+ newTranslate = linearAnimation(0, spreadView.positionMarker2, 0, -spreadView.sideStageWidth, root.progress);
166166 } else {
167− newTranslate += linearAnimation(0, spreadView.positionMarker2, 0, -spreadView.sideStageWidth * spreadView.snapPosition, root.animatedProgress)
167+ newTranslate += linearAnimation(0, spreadView.positionMarker2, 0, -spreadView.sideStageWidth * spreadView.snapPosition, root.animatedProgress);
168168 }
169169 }
170170
171171 if (spreadView.phase == 1) {
172172 if (nextInStack) {
173173 if (model.stage == ApplicationInfoInterface.MainStage) {
174− var startValue = -spreadView.sideStageWidth * spreadView.snapPosition + (spreadView.sideStageVisible ? -spreadView.sideStageWidth : 0)
174+ var startValue = -spreadView.sideStageWidth * spreadView.snapPosition + (spreadView.sideStageVisible ? -spreadView.sideStageWidth : 0);
175175 newTranslate += linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4, startValue, priv.phase2StartTranslate, root.animatedProgress);
176176 } else {
177177 var endValue = -spreadView.width + spreadView.width * root.zIndex / 6;
@@ -182,19 +182,19 @@ SpreadDelegate {
182182 }
183183 }
184184 } else if (root.active) {
185− var startProgress = spreadView.positionMarker2 - (zIndex * spreadView.positionMarker2 / 2)
186− var endProgress = spreadView.positionMarker4 - (zIndex * spreadView.tileDistance / spreadView.width)
187− var startTranslate = -root.width + (shouldMoveAway ? -units.gu(4) : 0)
185+ var startProgress = spreadView.positionMarker2 - (zIndex * spreadView.positionMarker2 / 2);
186+ var endProgress = spreadView.positionMarker4 - (zIndex * spreadView.tileDistance / spreadView.width);
187+ var startTranslate = -root.width + (shouldMoveAway ? -units.gu(4) : 0);
188188 newTranslate = linearAnimation(startProgress, endProgress, startTranslate, priv.phase2StartTranslate, root.progress);
189189 } else {
190− var startProgress = spreadView.positionMarker2 - (zIndex * spreadView.positionMarker2 / 2)
191− var endProgress = spreadView.positionMarker4 - (zIndex * spreadView.tileDistance / spreadView.width)
190+ var startProgress = spreadView.positionMarker2 - (zIndex * spreadView.positionMarker2 / 2);
191+ var endProgress = spreadView.positionMarker4 - (zIndex * spreadView.tileDistance / spreadView.width);
192192 newTranslate = linearAnimation(startProgress, endProgress, 0, priv.phase2StartTranslate, root.progress);
193193 }
194194 }
195195
196196 if (spreadView.phase == 2) {
197− newTranslate = -easingCurve.value * (spreadView.width - root.zIndex * animatedEndDistance)
197+ newTranslate = -easingCurve.value * (spreadView.width - root.zIndex * animatedEndDistance);
198198 }
199199
200200 return newTranslate;
@@ -206,7 +206,7 @@ SpreadDelegate {
206206 }
207207
208208 if (isSelected) {
209− return linearAnimation(selectedProgress, negativeProgress, selectedScale, 1, root.progress)
209+ return linearAnimation(selectedProgress, negativeProgress, selectedScale, 1, root.progress);
210210 }
211211
212212 if (spreadView.phase == 0) {
@@ -220,7 +220,7 @@ SpreadDelegate {
220220 } else if (active) {
221221 return 1;
222222 } else {
223− return linearAnimation(0, spreadView.positionMarker2, root.startScale, root.endScale, root.progress)
223+ return linearAnimation(0, spreadView.positionMarker2, root.startScale, root.endScale, root.progress);
224224 }
225225 }
226226
@@ -230,15 +230,15 @@ SpreadDelegate {
230230 if (model.stage !== ApplicationInfoInterface.SideStage || spreadView.sideStageVisible) {
231231 startScale = root.dragStartScale - ((root.dragStartScale - 1) * spreadView.snapPosition);
232232 }
233− return linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4, startScale, priv.phase2StartScale, root.animatedProgress)
233+ return linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4, startScale, priv.phase2StartScale, root.animatedProgress);
234234 }
235− var startProgress = spreadView.positionMarker2 - (zIndex * spreadView.positionMarker2 / 2)
236− var endProgress = spreadView.positionMarker4 - (zIndex * spreadView.tileDistance / spreadView.width)
237− return linearAnimation(startProgress, endProgress, 1, priv.phase2StartScale, root.animatedProgress)
235+ var startProgress = spreadView.positionMarker2 - (zIndex * spreadView.positionMarker2 / 2);
236+ var endProgress = spreadView.positionMarker4 - (zIndex * spreadView.tileDistance / spreadView.width);
237+ return linearAnimation(startProgress, endProgress, 1, priv.phase2StartScale, root.animatedProgress);
238238 }
239239
240240 if (spreadView.phase == 2) {
241− return root.startScale - easingCurve.value * (root.startScale - root.endScale)
241+ return root.startScale - easingCurve.value * (root.startScale - root.endScale);
242242 }
243243
244244 return 1;
@@ -249,36 +249,36 @@ SpreadDelegate {
249249 return selectedAngle;
250250 }
251251 if (isSelected) {
252− return linearAnimation(selectedProgress, negativeProgress, selectedAngle, 0, root.progress)
252+ return linearAnimation(selectedProgress, negativeProgress, selectedAngle, 0, root.progress);
253253 }
254254
255255 // The tile should rotate a bit when another one comes on top, but not when only dragging the side stage in
256− var shouldMoveAway = spreadView.nextInStack >= 0 && movedActive && (ApplicationManager.get(spreadView.nextInStack).stage === ApplicationInfoInterface.MainStage || model.stage == ApplicationInfoInterface.SideStage)
256+ var shouldMoveAway = spreadView.nextInStack >= 0 && movedActive && (ApplicationManager.get(spreadView.nextInStack).stage === ApplicationInfoInterface.MainStage || model.stage == ApplicationInfoInterface.SideStage);
257257
258258 if (spreadView.phase == 0) {
259259 if (nextInStack) {
260260 if (model.stage == ApplicationInfoInterface.SideStage && !spreadView.sideStageVisible) {
261261 return 0;
262262 } else {
263− return linearAnimation(0, spreadView.positionMarker2, root.startAngle, root.startAngle * (1-spreadView.snapPosition), root.animatedProgress)
263+ return linearAnimation(0, spreadView.positionMarker2, root.startAngle, root.startAngle * (1-spreadView.snapPosition), root.animatedProgress);
264264 }
265265 }
266266 if (shouldMoveAway) {
267− return linearAnimation(0, spreadView.positionMarker2, 0, root.startAngle * (1-spreadView.snapPosition), root.animatedProgress)
267+ return linearAnimation(0, spreadView.positionMarker2, 0, root.startAngle * (1-spreadView.snapPosition), root.animatedProgress);
268268 }
269269 }
270270 if (spreadView.phase == 1) {
271271 if (nextInStack) {
272272 if (model.stage == ApplicationInfoInterface.SideStage && !spreadView.sideStageVisible) {
273− return linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4, 0, priv.phase2StartAngle, root.animatedProgress)
273+ return linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4, 0, priv.phase2StartAngle, root.animatedProgress);
274274 } else {
275− return linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4, root.startAngle * (1-spreadView.snapPosition), priv.phase2StartAngle, root.animatedProgress)
275+ return linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4, root.startAngle * (1-spreadView.snapPosition), priv.phase2StartAngle, root.animatedProgress);
276276 }
277277 }
278− var startProgress = spreadView.positionMarker2 - (zIndex * spreadView.positionMarker2 / 2)
279− var endProgress = spreadView.positionMarker4 - (zIndex * spreadView.tileDistance / spreadView.width)
280− var startAngle = shouldMoveAway ? root.startAngle * (1-spreadView.snapPosition) : 0
281− return linearAnimation(startProgress, endProgress, startAngle, priv.phase2StartAngle, root.progress)
278+ var startProgress = spreadView.positionMarker2 - (zIndex * spreadView.positionMarker2 / 2);
279+ var endProgress = spreadView.positionMarker4 - (zIndex * spreadView.tileDistance / spreadView.width);
280+ var startAngle = shouldMoveAway ? root.startAngle * (1-spreadView.snapPosition) : 0;
281+ return linearAnimation(startProgress, endProgress, startAngle, priv.phase2StartAngle, root.progress);
282282 }
283283 if (spreadView.phase == 2) {
284284 return root.startAngle - easingCurve.value * (root.startAngle - root.endAngle);
@@ -289,7 +289,7 @@ SpreadDelegate {
289289
290290 property real opacityTransform: {
291291 if (otherSelected && spreadView.phase == 2) {
292− return linearAnimation(selectedProgress, negativeProgress, selectedOpacity, 0, root.progress)
292+ return linearAnimation(selectedProgress, negativeProgress, selectedOpacity, 0, root.progress);
293293 }
294294
295295 return 1;