aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickevents.cpp
diff options
context:
space:
mode:
authorJan Arve Saether <jan-arve.saether@qt.io>2017-05-22 15:34:18 +0200
committerShawn Rutledge <shawn.rutledge@qt.io>2017-05-26 10:59:37 +0000
commit0e3adb65b0e9c44fa6e202630ff57c907ecf0820 (patch)
tree1169b78f859b7702b246d4c08f30c935dbeb9550 /src/quick/items/qquickevents.cpp
parentb10e30705400a7967fd8c4215f201ce9586d9ecc (diff)
Fix some problems with MouseDblClick handling
The sequence of events delivered from a double click is: [Press,Release,Press,DblClick,Release] The problem was that a DblClick was delivered just like a press event, so it would clear the passive grabber that was established because of the former Press event. When the Release event then got processed, there was therefore a risk that the Release event was not delivered to the passive grabber. The fix is to not deliver DblClick events at all to handlers, and to not deliver DblClick to items if the former Press event was accepted by a handler. Change-Id: I49c0e32ef4e33f7b6014d35dc065da2527b94779 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
Diffstat (limited to 'src/quick/items/qquickevents.cpp')
-rw-r--r--src/quick/items/qquickevents.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/quick/items/qquickevents.cpp b/src/quick/items/qquickevents.cpp
index bde271882c..830adc50b7 100644
--- a/src/quick/items/qquickevents.cpp
+++ b/src/quick/items/qquickevents.cpp
@@ -879,8 +879,9 @@ QQuickPointerEvent *QQuickPointerMouseEvent::reset(QEvent *event)
Qt::TouchPointState state = Qt::TouchPointStationary;
switch (ev->type()) {
case QEvent::MouseButtonPress:
- case QEvent::MouseButtonDblClick:
m_mousePoint->clearPassiveGrabbers();
+ Q_FALLTHROUGH();
+ case QEvent::MouseButtonDblClick:
state = Qt::TouchPointPressed;
break;
case QEvent::MouseButtonRelease:
@@ -1055,6 +1056,12 @@ bool QQuickPointerMouseEvent::isPressEvent() const
(me->buttons() & me->button()) == me->buttons());
}
+bool QQuickPointerMouseEvent::isDoubleClickEvent() const
+{
+ auto me = static_cast<QMouseEvent*>(m_event);
+ return (me->type() == QEvent::MouseButtonDblClick);
+}
+
bool QQuickPointerMouseEvent::isUpdateEvent() const
{
auto me = static_cast<QMouseEvent*>(m_event);