git.iko.soy/unity8
on xenial help sign in
Fix lp 1195349
7e3c79fAndrea Cimitan
Components/Carousel.qml+5−4
compare with xenial
unifiedsplit
@@ -72,7 +72,7 @@ Item {
72 id: listView
72 id: listView
73
73
74 property real minimumTileWidth: 0
74 property real minimumTileWidth: 0
75− property real newContentX: -1
75+ property real newContentX: disabledNewContentX
76 property real pathItemCount: referenceWidth / referenceTileWidth
76 property real pathItemCount: referenceWidth / referenceTileWidth
77 property real tileAspectRatio: 1
77 property real tileAspectRatio: 1
78
78
@@ -100,6 +100,7 @@ Item {
100 readonly property real kMiddleIndex: (realWidth / 2) / tileWidth - 0.5
100 readonly property real kMiddleIndex: (realWidth / 2) / tileWidth - 0.5
101 readonly property real kXBeginningEnd: 1 / tileWidth + kMiddleIndex / gapToMiddlePhase
101 readonly property real kXBeginningEnd: 1 / tileWidth + kMiddleIndex / gapToMiddlePhase
102 readonly property real maximumItemTranslation: (listView.tileWidth * 3) / listView.scaleFactor
102 readonly property real maximumItemTranslation: (listView.tileWidth * 3) / listView.scaleFactor
103+ readonly property real disabledNewContentX: -carousel.drawBuffer - 1
103 readonly property real realContentWidth: contentWidth - 2 * carousel.drawBuffer
104 readonly property real realContentWidth: contentWidth - 2 * carousel.drawBuffer
104 readonly property real realContentX: contentX + carousel.drawBuffer
105 readonly property real realContentX: contentX + carousel.drawBuffer
105 readonly property real realPathItemCount: Math.min(realWidth / tileWidth, pathItemCount)
106 readonly property real realPathItemCount: Math.min(realWidth / tileWidth, pathItemCount)
@@ -192,7 +193,7 @@ Item {
192 onMovementStarted: {
193 onMovementStarted: {
193 stepAnimation.stop()
194 stepAnimation.stop()
194 newContentXAnimation.stop()
195 newContentXAnimation.stop()
195− newContentX = -1
196+ newContentX = disabledNewContentX
196 }
197 }
197 onMovementEnded: {
198 onMovementEnded: {
198 if (realContentX > 0 && realContentX < realContentWidth - realWidth)
199 if (realContentX > 0 && realContentX < realContentWidth - realWidth)
@@ -228,7 +229,7 @@ Item {
228 easing.type: Easing.InOutQuad
229 easing.type: Easing.InOutQuad
229 }
230 }
230 ScriptAction {
231 ScriptAction {
231− script: listView.newContentX = -1
232+ script: listView.newContentX = listView.disabledNewContentX
232 }
233 }
233 }
234 }
234
235
@@ -253,7 +254,7 @@ Item {
253 readonly property bool explicitScale: (!listView.moving ||
254 readonly property bool explicitScale: (!listView.moving ||
254 listView.realContentX <= 0 ||
255 listView.realContentX <= 0 ||
255 listView.realContentX >= listView.realContentWidth - listView.realWidth) &&
256 listView.realContentX >= listView.realContentWidth - listView.realWidth) &&
256− listView.newContentX < 0 &&
257+ listView.newContentX === listView.disabledNewContentX &&
257 index === listView.selectedIndex
258 index === listView.selectedIndex
258 readonly property real cachedTiles: listView.realPathItemCount + carousel.drawBuffer / listView.tileWidth
259 readonly property real cachedTiles: listView.realPathItemCount + carousel.drawBuffer / listView.tileWidth
259 readonly property real distance: listView.continuousIndex - index
260 readonly property real distance: listView.continuousIndex - index