git.iko.soy/unity8
on xenial help sign in
add some semicolons that got lost on the way
99e3039Michael Zanetti
qml/Stages/PhoneStage.qml+13−14
compare with xenial
unifiedsplit
@@ -33,7 +33,7 @@ Item {
33 readonly property bool locked: spreadView.phase == 2
33 readonly property bool locked: spreadView.phase == 2
34
34
35 function select(appId) {
35 function select(appId) {
36− spreadView.snapTo(priv.indexOf(appId))
36+ spreadView.snapTo(priv.indexOf(appId));
37 }
37 }
38
38
39 onWidthChanged: {
39 onWidthChanged: {
@@ -58,8 +58,8 @@ Item {
58 spreadView.snapTo(ApplicationManager.count - 1);
58 spreadView.snapTo(ApplicationManager.count - 1);
59 } else {
59 } else {
60 spreadView.phase = 0;
60 spreadView.phase = 0;
61− spreadView.contentX = -spreadView.shift
61+ spreadView.contentX = -spreadView.shift;
62− priv.switchToApp(appId)
62+ priv.switchToApp(appId);
63 }
63 }
64 }
64 }
65
65
@@ -81,7 +81,7 @@ Item {
81
81
82 function switchToApp(appId) {
82 function switchToApp(appId) {
83 if (priv.focusedAppId) {
83 if (priv.focusedAppId) {
84− spreadView.focusChanging = true
84+ spreadView.focusChanging = true;
85 ApplicationManager.focusApplication(appId);
85 ApplicationManager.focusApplication(appId);
86 } else {
86 } else {
87 ApplicationManager.focusApplication(appId);
87 ApplicationManager.focusApplication(appId);
@@ -172,9 +172,9 @@ Item {
172 snapAnimation.targetContentX = -shift;
172 snapAnimation.targetContentX = -shift;
173 snapAnimation.start();
173 snapAnimation.start();
174 } else if (shiftedContentX < positionMarker2 * width) {
174 } else if (shiftedContentX < positionMarker2 * width) {
175− snapTo(1)
175+ snapTo(1);
176 } else if (shiftedContentX < positionMarker3 * width) {
176 } else if (shiftedContentX < positionMarker3 * width) {
177− snapTo(1)
177+ snapTo(1);
178 } else if (phase < 2){
178 } else if (phase < 2){
179 // Add 1 pixel to make sure we definitely hit positionMarker4 even with rounding errors of the animation.
179 // Add 1 pixel to make sure we definitely hit positionMarker4 even with rounding errors of the animation.
180 snapAnimation.targetContentX = width * positionMarker4 + 1 - shift;
180 snapAnimation.targetContentX = width * positionMarker4 + 1 - shift;
@@ -213,7 +213,7 @@ Item {
213 if (spreadView.selectedIndex >= 0) {
213 if (spreadView.selectedIndex >= 0) {
214 ApplicationManager.focusApplication(ApplicationManager.get(spreadView.selectedIndex).appId);
214 ApplicationManager.focusApplication(ApplicationManager.get(spreadView.selectedIndex).appId);
215
215
216− spreadView.selectedIndex = -1
216+ spreadView.selectedIndex = -1;
217 spreadView.phase = 0;
217 spreadView.phase = 0;
218 spreadView.contentX = -spreadView.shift;
218 spreadView.contentX = -spreadView.shift;
219 }
219 }
@@ -233,7 +233,7 @@ Item {
233 }
233 }
234 onWidthChanged: {
234 onWidthChanged: {
235 if (spreadView.closingIndex >= 0) {
235 if (spreadView.closingIndex >= 0) {
236− spreadView.contentX = Math.min(spreadView.contentX, width - spreadView.width - spreadView.shift)
236+ spreadView.contentX = Math.min(spreadView.contentX, width - spreadView.width - spreadView.shift);
237 }
237 }
238 }
238 }
239
239
@@ -269,7 +269,7 @@ Item {
269 UbuntuNumberAnimation {
269 UbuntuNumberAnimation {
270 onRunningChanged: {
270 onRunningChanged: {
271 if (!running) {
271 if (!running) {
272− spreadView.closingIndex = -1
272+ spreadView.closingIndex = -1;
273 }
273 }
274 }
274 }
275 }
275 }
@@ -281,7 +281,7 @@ Item {
281 duration: UbuntuAnimation.FastDuration
281 duration: UbuntuAnimation.FastDuration
282 onRunningChanged: {
282 onRunningChanged: {
283 if (!running) {
283 if (!running) {
284− spreadView.focusChanging = false
284+ spreadView.focusChanging = false;
285 }
285 }
286 }
286 }
287 }
287 }
@@ -335,9 +335,9 @@ Item {
335 }
335 }
336
336
337 onClosed: {
337 onClosed: {
338− spreadView.draggedIndex = -1
338+ spreadView.draggedIndex = -1;
339− spreadView.closingIndex = index
339+ spreadView.closingIndex = index;
340− ApplicationManager.stopApplication(ApplicationManager.get(index).appId)
340+ ApplicationManager.stopApplication(ApplicationManager.get(index).appId);
341 }
341 }
342 }
342 }
343 }
343 }
@@ -414,5 +414,4 @@ Item {
414 }
414 }
415 }
415 }
416 }
416 }
417−
418}
417}