Promote pressPoint to QQuickPopup

Change-Id: I5aac904b7fb9397f799817ccaf5e0eb04b0129a9
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

4 files changed, 5 insertions, 5 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();
 }
 
diff --git a/src/quicktemplates2/qquickdrawer_p_p.h b/src/quicktemplates2/qquickdrawer_p_p.h
index 8956acef..bfa97fb1 100644
--- a/src/quicktemplates2/qquickdrawer_p_p.h
+++ b/src/quicktemplates2/qquickdrawer_p_p.h
@@ -88,7 +88,6 @@ public:
     qreal offset;
     qreal position;
     qreal dragMargin;
-    QPointF pressPoint;
     QQuickVelocityCalculator velocityCalculator;
 };
 
diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp
index 9fb712ea..45c4e86e 100644
--- a/src/quicktemplates2/qquickpopup.cpp
+++ b/src/quicktemplates2/qquickpopup.cpp
@@ -324,6 +324,7 @@ bool QQuickPopupPrivate::blockInput(QQuickItem *item, const QPointF &point) cons
 bool QQuickPopupPrivate::handlePress(QQuickItem *item, const QPointF &point, ulong timestamp)
 {
     Q_UNUSED(timestamp);
+    pressPoint = point;
     tryClose(point, QQuickPopup::CloseOnPressOutside | QQuickPopup::CloseOnPressOutsideParent);
     return blockInput(item, point);
 }
@@ -338,6 +339,7 @@ bool QQuickPopupPrivate::handleRelease(QQuickItem *item, const QPointF &point, u
 {
     Q_UNUSED(timestamp);
     tryClose(point, QQuickPopup::CloseOnReleaseOutside | QQuickPopup::CloseOnReleaseOutsideParent);
+    pressPoint = QPointF();
     touchId = -1;
     return blockInput(item, point);
 }
@@ -351,6 +353,7 @@ void QQuickPopupPrivate::handleUngrab()
         if (p->mouseGrabberPopup == q)
             p->mouseGrabberPopup = nullptr;
     }
+    pressPoint = QPointF();
     touchId = -1;
 }
 
diff --git a/src/quicktemplates2/qquickpopup_p_p.h b/src/quicktemplates2/qquickpopup_p_p.h
index f5697993..316ea5bd 100644
--- a/src/quicktemplates2/qquickpopup_p_p.h
+++ b/src/quicktemplates2/qquickpopup_p_p.h
@@ -165,6 +165,7 @@ public:
     qreal bottomMargin;
     qreal contentWidth;
     qreal contentHeight;
+    QPointF pressPoint;
     TransitionState transitionState;
     QQuickPopup::ClosePolicy closePolicy;
     QQuickItem *parentItem;