@@ -261,77 +261,83 @@ Item {
261 listView.gapToEndPhase,
261 listView.gapToEndPhase,
262 listView.translationXViewFactor)
262 listView.translationXViewFactor)
264+ delegate: tileWidth != 0 && tileHeight != 0 ? loaderComponent : undefined
264− delegate: Loader {
269+ Loader {
265− property bool explicitlyScaled: explicitScaleFactor == carousel.selectedItemScaleFactor
270+ property bool explicitlyScaled: explicitScaleFactor == carousel.selectedItemScaleFactor
266− property real explicitScaleFactor: explicitScale ? carousel.selectedItemScaleFactor : 1.0
271+ property real explicitScaleFactor: explicitScale ? carousel.selectedItemScaleFactor : 1.0
267− readonly property bool explicitScale: (!listView.moving ||
272+ readonly property bool explicitScale: (!listView.moving ||
268− listView.realContentX <= 0 ||
273+ listView.realContentX <= 0 ||
269− listView.realContentX >= listView.realContentWidth - listView.realWidth) &&
274+ listView.realContentX >= listView.realContentWidth - listView.realWidth) &&
270− listView.newContentX === listView.disabledNewContentX &&
275+ listView.newContentX === listView.disabledNewContentX &&
271− index === listView.selectedIndex
276+ index === listView.selectedIndex
272− readonly property real cachedTiles: listView.realPathItemCount + carousel.drawBuffer / listView.tileWidth
277+ readonly property real cachedTiles: listView.realPathItemCount + carousel.drawBuffer / listView.tileWidth
273− readonly property real distance: listView.continuousIndex - index
278+ readonly property real distance: listView.continuousIndex - index
274− readonly property real itemTranslationScale: CarouselJS.getItemScale(0.5,
279+ readonly property real itemTranslationScale: CarouselJS.getItemScale(0.5,
275− (index + 0.5), // good approximation of scale while changing selected item
280+ (index + 0.5), // good approximation of scale while changing selected item
276− listView.count,
281+ listView.count,
277− listView.visibleTilesScaleFactor)
282+ listView.visibleTilesScaleFactor)
278− readonly property real itemScale: CarouselJS.getItemScale(distance,
283+ readonly property real itemScale: CarouselJS.getItemScale(distance,
279− listView.continuousIndex,
284+ listView.continuousIndex,
280− listView.count,
285+ listView.count,
281− listView.visibleTilesScaleFactor)
286+ listView.visibleTilesScaleFactor)
282− readonly property real translationX: CarouselJS.getItemTranslation(index,
287+ readonly property real translationX: CarouselJS.getItemTranslation(index,
283− listView.selectedIndex,
288+ listView.selectedIndex,
284− distance,
289+ distance,
285− itemScale,
290+ itemScale,
286− itemTranslationScale,
291+ itemTranslationScale,
287− listView.maximumItemTranslation)
292+ listView.maximumItemTranslation)
289− readonly property real xTransform: listView.viewTranslation + translationX * listView.scaleFactor
294+ readonly property real xTransform: listView.viewTranslation + translationX * listView.scaleFactor
290− readonly property real center: x - listView.contentX + xTransform - drawBuffer + (width/2)
295+ readonly property real center: x - listView.contentX + xTransform - drawBuffer + (width/2)
292− width: listView.tileWidth
297+ width: listView.tileWidth
293− height: listView.tileHeight
298+ height: listView.tileHeight
294− scale: itemScale * explicitScaleFactor
299+ scale: itemScale * explicitScaleFactor
295− sourceComponent: itemComponent
300+ sourceComponent: itemComponent
296− z: cachedTiles - Math.abs(index - listView.selectedIndex)
301+ z: cachedTiles - Math.abs(index - listView.selectedIndex)
298− transform: Translate {
303+ transform: Translate {
299− x: xTransform
304+ x: xTransform
302− Behavior on explicitScaleFactor {
307+ Behavior on explicitScaleFactor {
303− SequentialAnimation {
308+ SequentialAnimation {
304− ScriptAction {
309+ ScriptAction {
305− script: if (!explicitScale)
310+ script: if (!explicitScale)
306− explicitlyScaled = false
311+ explicitlyScaled = false
308− NumberAnimation {
313+ NumberAnimation {
309− duration: explicitScaleFactor === 1.0 ? 250 : 150
314+ duration: explicitScaleFactor === 1.0 ? 250 : 150
310− easing.type: Easing.InOutQuad
315+ easing.type: Easing.InOutQuad
312− ScriptAction {
317+ ScriptAction {
313− script: if (explicitScale)
318+ script: if (explicitScale)
314− explicitlyScaled = true
319+ explicitlyScaled = true
319− onLoaded: {
324+ onLoaded: {
320− item.explicitlyScaled = Qt.binding(function() { return explicitlyScaled; })
325+ item.explicitlyScaled = Qt.binding(function() { return explicitlyScaled; })
321− item.model = Qt.binding(function() { return model; })
326+ item.model = Qt.binding(function() { return model; })
324− MouseArea {
329+ MouseArea {
325− id: mouseArea
330+ id: mouseArea
327− anchors.fill: parent
332+ anchors.fill: parent
329− onClicked: {
334+ onClicked: {
330− listView.itemClicked(index, item)
335+ listView.itemClicked(index, item)
333− onPressAndHold: {
338+ onPressAndHold: {
334− listView.itemPressAndHold(index, item)
339+ listView.itemPressAndHold(index, item)