diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-06-29 16:37:02 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-07-04 19:21:25 +0000 |
| commit | 57810c5c736f69790dd49fa1146eb70de8c95a55 (patch) | |
| tree | 6d961714b70edef1f86e2cb08123b71dd752a138 /src/quicktemplates2/qquickpopup.cpp | |
| parent | 64dd82cdeaf0a6ad10e0fb57a7dabe73ea9cb77e (diff) | |
Fix modal overlay to block multi-touch
Task-number: QTBUG-61698
Change-Id: I46db5e9816190ac7afd6b671198dff11089bc4f3
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickpopup.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickpopup.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp index 54f45767..ee2a04b1 100644 --- a/src/quicktemplates2/qquickpopup.cpp +++ b/src/quicktemplates2/qquickpopup.cpp @@ -381,14 +381,14 @@ bool QQuickPopupPrivate::handleTouchEvent(QQuickItem *item, QTouchEvent *event) switch (event->type()) { case QEvent::TouchBegin: for (const QTouchEvent::TouchPoint &point : event->touchPoints()) { - if (acceptTouch(point)) + if (acceptTouch(point) || blockInput(item, point.pos())) return handlePress(item, item->mapToScene(point.pos()), event->timestamp()); } break; case QEvent::TouchUpdate: for (const QTouchEvent::TouchPoint &point : event->touchPoints()) { - if (!acceptTouch(point)) + if (!acceptTouch(point) && !blockInput(item, point.pos())) continue; switch (point.state()) { @@ -406,7 +406,7 @@ bool QQuickPopupPrivate::handleTouchEvent(QQuickItem *item, QTouchEvent *event) case QEvent::TouchEnd: for (const QTouchEvent::TouchPoint &point : event->touchPoints()) { - if (acceptTouch(point)) + if (acceptTouch(point) || blockInput(item, point.pos())) return handleRelease(item, item->mapToScene(point.pos()), event->timestamp()); } break; |