git.iko.soy/unity8
on xenial help sign in
slow down scrolling a bit and fix the flickables contentWidth to roughly reflect the app's positions
4e62a68Michael Zanetti
qml/Stages/PhoneStage.qml+3−5
compare with xenial
unifiedsplit
@@ -227,7 +227,7 @@ Item {
227 id: coverFlickable
227 id: coverFlickable
228 anchors.fill: root
228 anchors.fill: root
229 contentHeight: height
229 contentHeight: height
230− contentWidth: width * ApplicationManager.count
230+ contentWidth: width * 2 + ((ApplicationManager.count - 2) * root.width * coverFlip.tileDistance * 1.5)
231 flickableDirection: Qt.Horizontal
231 flickableDirection: Qt.Horizontal
232 enabled: coverFlip.visible
232 enabled: coverFlip.visible
233
233
@@ -238,11 +238,9 @@ Item {
238 contentX = width * coverFlip.progressMarker1;
238 contentX = width * coverFlip.progressMarker1;
239 return;
239 return;
240 }
240 }
241−
242 var progress = contentX / width
241 var progress = contentX / width
243 if (progress > coverFlip.progressMarker1) {
242 if (progress > coverFlip.progressMarker1) {
244 coverFlickable.passedFirstStage = true;
243 coverFlickable.passedFirstStage = true;
245− progress += progress - coverFlip.progressMarker1
246 }
244 }
247 coverFlip.progress = progress;
245 coverFlip.progress = progress;
248 }
246 }
@@ -298,9 +296,9 @@ Item {
298 snapAnimation.targetAppId = ApplicationManager.get(0).appId;
296 snapAnimation.targetAppId = ApplicationManager.get(0).appId;
299 } else {
297 } else {
300 if (ApplicationManager.count == 3) {
298 if (ApplicationManager.count == 3) {
301− snapAnimation.targetContentX = root.width * .8;
299+ snapAnimation.targetContentX = root.width * 1.1;
302 } else {
300 } else {
303− snapAnimation.targetContentX = root.width * .9;
301+ snapAnimation.targetContentX = root.width * 1.25;
304 }
302 }
305 snapAnimation.targetAppId = "";
303 snapAnimation.targetAppId = "";
306 }
304 }