diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-04-28 15:51:19 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-04-28 17:45:50 +0000 |
commit | c028ada0384ffaf22058536d0a7cba8e89f2106a (patch) | |
tree | 06b26962de97b69dc2c9e7e4bc8646af6168ba73 /src/quicktemplates2/qquickdrawer.cpp | |
parent | f71d22d6e077410c42291486e15b67215baa0739 (diff) |
Promote pressPoint to QQuickPopup
Change-Id: I5aac904b7fb9397f799817ccaf5e0eb04b0129a9
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickdrawer.cpp')
-rw-r--r-- | src/quicktemplates2/qquickdrawer.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/quicktemplates2/qquickdrawer.cpp b/src/quicktemplates2/qquickdrawer.cpp index b896c142..5fdc8be4 100644 --- a/src/quicktemplates2/qquickdrawer.cpp +++ b/src/quicktemplates2/qquickdrawer.cpp @@ -383,7 +383,6 @@ static const qreal openCloseVelocityThreshold = 300; bool QQuickDrawerPrivate::handlePress(QQuickItem *item, const QPointF &point, ulong timestamp) { offset = 0; - pressPoint = point; velocityCalculator.startMeasuring(point, timestamp); if (!QQuickPopupPrivate::handlePress(item, point, timestamp)) @@ -411,13 +410,12 @@ bool QQuickDrawerPrivate::handleMove(QQuickItem *item, const QPointF &point, ulo bool QQuickDrawerPrivate::handleRelease(QQuickItem *item, const QPointF &point, ulong timestamp) { - pressPoint = QPointF(); - if (!popupItem->keepMouseGrab() && !popupItem->keepTouchGrab()) { velocityCalculator.reset(); return QQuickPopupPrivate::handleRelease(item, point, timestamp); } + pressPoint = QPointF(); velocityCalculator.stopMeasuring(point, timestamp); qreal velocity = 0; @@ -481,7 +479,6 @@ void QQuickDrawerPrivate::handleUngrab() { QQuickPopupPrivate::handleUngrab(); - pressPoint = QPoint(); velocityCalculator.reset(); } |