From 18a444c33074dd89f8855ad12dca1c55f566ff86 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 27 Mar 2014 12:21:42 +0100 Subject: Send touch update events to widget if there is a gesture pending for it. Otherwise, touch update/end events were ignored and the gestures were never triggered (unless a native widget was used). Task-number: QTBUG-37759 Change-Id: I4b0145ffe535065e1458164b67bc8d9e33a4af97 Reviewed-by: Laszlo Agocs Reviewed-by: Eskil Abrahamsen Blomfeldt Reviewed-by: Shawn Rutledge --- src/widgets/kernel/qapplication.cpp | 6 +++++- src/widgets/kernel/qgesturemanager.cpp | 6 ++++++ src/widgets/kernel/qgesturemanager_p.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index 467d39c17e..ed376fe923 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -3973,7 +3973,11 @@ bool QApplicationPrivate::translateRawTouchEvent(QWidget *window, break; } default: - if (widget->testAttribute(Qt::WA_WState_AcceptedTouchBeginEvent)) { + if (widget->testAttribute(Qt::WA_WState_AcceptedTouchBeginEvent) +#ifndef QT_NO_GESTURES + || QGestureManager::gesturePending(widget) +#endif + ) { if (touchEvent.type() == QEvent::TouchEnd) widget->setAttribute(Qt::WA_WState_AcceptedTouchBeginEvent, false); if (QApplication::sendSpontaneousEvent(widget, &touchEvent) && touchEvent.isAccepted()) diff --git a/src/widgets/kernel/qgesturemanager.cpp b/src/widgets/kernel/qgesturemanager.cpp index 18abad4b40..929e5e2fcf 100644 --- a/src/widgets/kernel/qgesturemanager.cpp +++ b/src/widgets/kernel/qgesturemanager.cpp @@ -718,6 +718,12 @@ void QGestureManager::recycle(QGesture *gesture) } } +bool QGestureManager::gesturePending(QObject *o) +{ + const QGestureManager *gm = QGestureManager::instance(); + return gm && gm->m_gestureOwners.key(o); +} + QT_END_NAMESPACE #endif // QT_NO_GESTURES diff --git a/src/widgets/kernel/qgesturemanager_p.h b/src/widgets/kernel/qgesturemanager_p.h index 4ab631a921..6264b5a25d 100644 --- a/src/widgets/kernel/qgesturemanager_p.h +++ b/src/widgets/kernel/qgesturemanager_p.h @@ -81,6 +81,7 @@ public: #endif //QT_NO_GRAPHICSVIEW static QGestureManager* instance(); // declared in qapplication.cpp + static bool gesturePending(QObject *o); void cleanupCachedGestures(QObject *target, Qt::GestureType type); -- cgit v1.2.3