diff options
Diffstat (limited to 'src/quick/items')
-rw-r--r-- | src/quick/items/qquickpathview.cpp | 10 | ||||
-rw-r--r-- | src/quick/items/qquickpathview_p_p.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/quick/items/qquickpathview.cpp b/src/quick/items/qquickpathview.cpp index 302532c3d1..05bf50574c 100644 --- a/src/quick/items/qquickpathview.cpp +++ b/src/quick/items/qquickpathview.cpp @@ -753,7 +753,7 @@ void QQuickPathView::setCurrentIndex(int idx) if (d->modelCount) { d->createCurrentItem(); if (d->haveHighlightRange && d->highlightRangeMode == QQuickPathView::StrictlyEnforceRange) - d->snapToIndex(d->currentIndex); + d->snapToIndex(d->currentIndex, QQuickPathViewPrivate::SetIndex); d->currentItemOffset = d->positionOfIndex(d->currentIndex); d->updateHighlight(); } @@ -988,7 +988,7 @@ void QQuickPathView::setHighlightRangeMode(HighlightRangeMode mode) d->regenerate(); int index = d->highlightRangeMode != NoHighlightRange ? d->currentIndex : d->calcCurrentIndex(); if (index >= 0) - d->snapToIndex(index); + d->snapToIndex(index, QQuickPathViewPrivate::Other); } emit highlightRangeModeChanged(); } @@ -2306,12 +2306,12 @@ void QQuickPathViewPrivate::fixOffset() if (curr != currentIndex && highlightRangeMode == QQuickPathView::StrictlyEnforceRange) q->setCurrentIndex(curr); else - snapToIndex(curr); + snapToIndex(curr, Other); } } } -void QQuickPathViewPrivate::snapToIndex(int index) +void QQuickPathViewPrivate::snapToIndex(int index, MovementReason reason) { if (!model || modelCount <= 0) return; @@ -2321,7 +2321,7 @@ void QQuickPathViewPrivate::snapToIndex(int index) if (offset == targetOffset) return; - moveReason = Other; + moveReason = reason; offsetAdj = 0.0; tl.reset(moveOffset); moveOffset.setValue(offset); diff --git a/src/quick/items/qquickpathview_p_p.h b/src/quick/items/qquickpathview_p_p.h index 2a497881d4..73e4884424 100644 --- a/src/quick/items/qquickpathview_p_p.h +++ b/src/quick/items/qquickpathview_p_p.h @@ -114,7 +114,8 @@ public: void setAdjustedOffset(qreal offset); void regenerate(); void updateItem(QQuickItem *, qreal); - void snapToIndex(int index); + enum MovementReason { Other, SetIndex, Mouse }; + void snapToIndex(int index, MovementReason reason); QPointF pointNear(const QPointF &point, qreal *nearPercent=0) const; void addVelocitySample(qreal v); qreal calcVelocity() const; @@ -163,7 +164,6 @@ public: QList<QQuickItem *> itemCache; QPointer<QQmlInstanceModel> model; QVariant modelVariant; - enum MovementReason { Other, SetIndex, Mouse }; MovementReason moveReason; enum MovementDirection { Shortest, Negative, Positive }; MovementDirection moveDirection; |