TapHandler: don't reject stationary touchpoints

Multiple TapHandlers must be able to react to multiple touchpoints.
Often when multiple touchpoints are in contact, some of them will be
stationary.  In that case TapHandler should not give up its active
state, which is the result of returning false from wantsEventPoint().

This partially reverts commit dcc7367997e7241918cdf0c702c7bb8325eb1ad4.

Fixes: QTBUG-76954
Change-Id: I836baf771f09d48be8d032472b0c3143e8f7f723
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
(cherry picked from commit 7cdc3727a2b01c59d0a9e19a3cfc4e226ac1ab77)

2 files changed, 23 insertions, 0 deletions

diff --git a/tests/auto/quick/pointerhandlers/qquicktaphandler/data/Button.qml b/tests/auto/quick/pointerhandlers/qquicktaphandler/data/Button.qml
index 042b730799..800c25c77d 100644
--- a/tests/auto/quick/pointerhandlers/qquicktaphandler/data/Button.qml
+++ b/tests/auto/quick/pointerhandlers/qquicktaphandler/data/Button.qml
@@ -31,6 +31,7 @@ import QtQuick 2.12
 Rectangle {
     id: root
     property alias label: label.text
+    property alias active: tap.active
     property alias pressed: tap.pressed
     property bool checked: false
     property alias gesturePolicy: tap.gesturePolicy
diff --git a/tests/auto/quick/pointerhandlers/qquicktaphandler/tst_qquicktaphandler.cpp b/tests/auto/quick/pointerhandlers/qquicktaphandler/tst_qquicktaphandler.cpp
index e77ea97518..419afed3ac 100644
--- a/tests/auto/quick/pointerhandlers/qquicktaphandler/tst_qquicktaphandler.cpp
+++ b/tests/auto/quick/pointerhandlers/qquicktaphandler/tst_qquicktaphandler.cpp
@@ -600,10 +600,32 @@ void tst_TapHandler::buttonsMultiTouch()
     touchSeq.stationary(1).press(2, p2, window).commit();
     QQuickTouchUtils::flush(window);
     QTRY_VERIFY(buttonWithinBounds->property("pressed").toBool());
+    QVERIFY(buttonWithinBounds->property("active").toBool());
     QPoint p3 = buttonReleaseWithinBounds->mapToScene(QPointF(20, 20)).toPoint();
     touchSeq.stationary(1).stationary(2).press(3, p3, window).commit();
     QQuickTouchUtils::flush(window);
     QTRY_VERIFY(buttonReleaseWithinBounds->property("pressed").toBool());
+    QVERIFY(buttonReleaseWithinBounds->property("active").toBool());
+    QVERIFY(buttonWithinBounds->property("pressed").toBool());
+    QVERIFY(buttonWithinBounds->property("active").toBool());
+    QVERIFY(buttonDragThreshold->property("pressed").toBool());
+
+    // combinations of small touchpoint movements and stationary points should not cause state changes
+    p1 += QPoint(2, 0);
+    p2 += QPoint(3, 0);
+    touchSeq.move(1, p1).move(2, p2).stationary(3).commit();
+    QVERIFY(buttonDragThreshold->property("pressed").toBool());
+    QVERIFY(buttonWithinBounds->property("pressed").toBool());
+    QVERIFY(buttonWithinBounds->property("active").toBool());
+    QVERIFY(buttonReleaseWithinBounds->property("pressed").toBool());
+    QVERIFY(buttonReleaseWithinBounds->property("active").toBool());
+    p3 += QPoint(4, 0);
+    touchSeq.stationary(1).stationary(2).move(3, p3).commit();
+    QVERIFY(buttonDragThreshold->property("pressed").toBool());
+    QVERIFY(buttonWithinBounds->property("pressed").toBool());
+    QVERIFY(buttonWithinBounds->property("active").toBool());
+    QVERIFY(buttonReleaseWithinBounds->property("pressed").toBool());
+    QVERIFY(buttonReleaseWithinBounds->property("active").toBool());
 
     // can release top button and press again: others stay pressed the whole time
     touchSeq.stationary(2).stationary(3).release(1, p1, window).commit();