From c028ada0384ffaf22058536d0a7cba8e89f2106a Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Fri, 28 Apr 2017 15:51:19 +0200 Subject: Promote pressPoint to QQuickPopup Change-Id: I5aac904b7fb9397f799817ccaf5e0eb04b0129a9 Reviewed-by: Mitch Curtis --- src/quicktemplates2/qquickdrawer.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/quicktemplates2/qquickdrawer.cpp') 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(); } -- cgit v1.2.3