diff options
| -rw-r--r-- | src/quick/handlers/qquickmultipointhandler.cpp | 6 | ||||
| -rw-r--r-- | src/quick/handlers/qquickmultipointhandler_p.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/handlers/qquickmultipointhandler.cpp b/src/quick/handlers/qquickmultipointhandler.cpp index 89733a4260..a074e966aa 100644 --- a/src/quick/handlers/qquickmultipointhandler.cpp +++ b/src/quick/handlers/qquickmultipointhandler.cpp @@ -81,7 +81,7 @@ bool QQuickMultiPointHandler::wantsPointerEvent(QQuickPointerEvent *event) return true; #endif - if (sameAsCurrentPoints(event)) + if (hasCurrentPoints(event)) return true; const QVector<QQuickEventPoint *> candidatePoints = eligiblePoints(event); @@ -199,11 +199,11 @@ void QQuickMultiPointHandler::setPointDistanceThreshold(qreal pointDistanceThres emit pointDistanceThresholdChanged(); } -bool QQuickMultiPointHandler::sameAsCurrentPoints(QQuickPointerEvent *event) +bool QQuickMultiPointHandler::hasCurrentPoints(QQuickPointerEvent *event) { bool ret = true; int c = event->pointCount(); - if (c != m_currentPoints.size()) + if (c < m_currentPoints.size()) return false; // TODO optimize: either ensure the points are sorted, // or use std::equal with a predicate diff --git a/src/quick/handlers/qquickmultipointhandler_p.h b/src/quick/handlers/qquickmultipointhandler_p.h index 5a44866e67..ddcf731227 100644 --- a/src/quick/handlers/qquickmultipointhandler_p.h +++ b/src/quick/handlers/qquickmultipointhandler_p.h @@ -98,7 +98,7 @@ protected: bool wantsPointerEvent(QQuickPointerEvent *event) override; void handlePointerEventImpl(QQuickPointerEvent *event) override; void onActiveChanged() override; - bool sameAsCurrentPoints(QQuickPointerEvent *event); + bool hasCurrentPoints(QQuickPointerEvent *event); QVector<QQuickEventPoint *> eligiblePoints(QQuickPointerEvent *event); qreal averageTouchPointDistance(const QPointF &ref); qreal averageStartingDistance(const QPointF &ref); |