diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2016-07-11 12:51:22 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2016-07-11 17:56:30 +0000 |
| commit | ccad62088a80fa33cedba58adb633d27055e87b6 (patch) | |
| tree | 77205a61697be18f280c3f61557a8d389647e279 /src/quick | |
| parent | 0f77ce872a22dfade05d2f699f0aa8a8c8ef7125 (diff) | |
Unite MousePress and DblClick delivery
Change-Id: I8a6a0a1c4c120aa674d93bcbb586c1a7048f9045
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/items/qquickwindow.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index 02056e1fbd..65af2a558b 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -1652,7 +1652,7 @@ bool QQuickWindowPrivate::deliverMouseEvent(QMouseEvent *event) lastMousePosition = event->windowPos(); if (!mouseGrabberItem && - event->type() == QEvent::MouseButtonPress && + (event->type() == QEvent::MouseButtonPress || event->type() == QEvent::MouseButtonDblClick) && (event->buttons() & event->button()) == event->buttons()) { if (deliverInitialMousePressEvent(contentItem, event)) event->accept(); @@ -2050,15 +2050,6 @@ void QQuickWindowPrivate::handleMouseEvent(QMouseEvent *event) case QEvent::MouseButtonDblClick: Q_QUICK_INPUT_PROFILE(QQuickProfiler::Mouse, QQuickProfiler::InputMouseDoubleClick, event->button(), event->buttons()); - - if (!mouseGrabberItem && (event->buttons() & event->button()) == event->buttons()) { - if (deliverInitialMousePressEvent(contentItem, event)) - event->accept(); - else - event->ignore(); - return; - } - deliverPointerEvent(currentPointerEvent.reset(event)); break; case QEvent::MouseMove: |