From dbcc38455369f15920d0e18c9be8d909010d5af8 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Tue, 18 Apr 2017 09:52:29 +0200 Subject: TapHandler:wants: don't setPressed(false) unless pointId matches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes the multibuttons manual test: the first button would see that a second point was pressed, and that it didn't want it, because it's outside the bounds. This is not a good reason to discontinue responding to the first touchpoint, which is the one it was first interested in. Change-Id: I7004a667873f235d3dda84b4261113d37d911763 Reviewed-by: Jan Arve Sæther --- src/quick/handlers/qquicktaphandler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/quick/handlers/qquicktaphandler.cpp') diff --git a/src/quick/handlers/qquicktaphandler.cpp b/src/quick/handlers/qquicktaphandler.cpp index 00bc3e27f0..85188700d9 100644 --- a/src/quick/handlers/qquicktaphandler.cpp +++ b/src/quick/handlers/qquicktaphandler.cpp @@ -138,7 +138,7 @@ bool QQuickTapHandler::wantsEventPoint(QQuickEventPoint *point) // so onGrabChanged(this, CancelGrabExclusive, point) and setPressed(false) will be called. // But when m_gesturePolicy is DragThreshold, we don't get an exclusive grab, but // we still don't want to be pressed anymore. - if (!ret) + if (!ret && point->pointId() == pointId()) setPressed(false, true, point); return ret; } -- cgit v1.2.3