PointHandler: stay active as long as acceptedButtons satisfied

Ignore buttons which do not fit the acceptedButtons filter, and
do not assume that it's all over when any release happens.

Task-number: QTBUG-66360
Change-Id: I871ea7fdd9b76f06fa0d73382617b287c04d35ab
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>

1 files changed, 7 insertions, 3 deletions

diff --git a/src/quick/handlers/qquickhandlerpoint.cpp b/src/quick/handlers/qquickhandlerpoint.cpp
index f615829d97..00347245ee 100644
--- a/src/quick/handlers/qquickhandlerpoint.cpp
+++ b/src/quick/handlers/qquickhandlerpoint.cpp
@@ -103,16 +103,20 @@ void QQuickHandlerPoint::reset(const QQuickEventPoint *point)
     switch (point->state()) {
     case QQuickEventPoint::Pressed:
         m_pressPosition = point->position();
+        m_scenePressPosition = point->scenePosition();
         m_pressedButtons = event->buttons();
         break;
     case QQuickEventPoint::Released:
-        reset();
-        return;
+        if (event->buttons() == Qt::NoButton) {
+            reset();
+            return;
+        }
+        break;
     default:
-        m_pressedButtons = event->buttons();
         break;
     }
     m_scenePressPosition = point->scenePressPosition();
+    m_pressedButtons = event->buttons();
     m_pressedModifiers = event->modifiers();
     if (event->asPointerTouchEvent()) {
         const QQuickEventTouchPoint *tp = static_cast<const QQuickEventTouchPoint *>(point);