diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-04-24 23:23:08 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-04-25 13:27:47 +0000 |
commit | 35415a2d70d5103d5a25c369fd42fec9a3842262 (patch) | |
tree | 63deab8dd3c2ed41abd2b1ca2180ec2856f35e28 /src | |
parent | 6a9042ad7d79865fb2077081d4357536d8e460a9 (diff) |
QQuickDrawer: move mouse/touch press handling to handlePress()
Change-Id: I8744525e1f185fa1e58d9e5d81f233a3aad3b2e1
Reviewed-by: Robin Burchell <robin.burchell@crimson.no>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/quicktemplates2/qquickdrawer.cpp | 25 | ||||
-rw-r--r-- | src/quicktemplates2/qquickdrawer_p.h | 1 | ||||
-rw-r--r-- | src/quicktemplates2/qquickdrawer_p_p.h | 1 |
3 files changed, 2 insertions, 25 deletions
diff --git a/src/quicktemplates2/qquickdrawer.cpp b/src/quicktemplates2/qquickdrawer.cpp index 0fb26772..41b169a4 100644 --- a/src/quicktemplates2/qquickdrawer.cpp +++ b/src/quicktemplates2/qquickdrawer.cpp @@ -276,7 +276,7 @@ bool QQuickDrawerPrivate::startDrag(QEvent *event) prepareEnterTransition(); reposition(); if (mouse) { - handleMousePressEvent(window->contentItem(), static_cast<QMouseEvent *>(event)); + handleMouseEvent(window->contentItem(), static_cast<QMouseEvent *>(event)); return true; } return false; @@ -403,18 +403,6 @@ void QQuickDrawerPrivate::handleUngrab() velocityCalculator.reset(); } -bool QQuickDrawerPrivate::handleMousePressEvent(QQuickItem *item, QMouseEvent *event) -{ - handlePress(item->mapToScene(event->localPos()), event->timestamp()); - - // don't block press events - // a) outside a non-modal drawer, - // b) to drawer children, or - // c) outside a modal drawer's background dimming - event->setAccepted(modal && !popupItem->isAncestorOf(item) && (!dimmer || dimmer->contains(dimmer->mapFromScene(pressPoint)))); - return event->isAccepted(); -} - bool QQuickDrawerPrivate::handleMouseMoveEvent(QQuickItem *item, QMouseEvent *event) { Q_Q(QQuickDrawer); @@ -632,10 +620,9 @@ bool QQuickDrawer::childMouseEventFilter(QQuickItem *child, QEvent *event) { Q_D(QQuickDrawer); switch (event->type()) { - case QEvent::MouseButtonPress: - return d->handleMousePressEvent(child, static_cast<QMouseEvent *>(event)); case QEvent::MouseMove: return d->handleMouseMoveEvent(child, static_cast<QMouseEvent *>(event)); + case QEvent::MouseButtonPress: case QEvent::MouseButtonRelease: d->handleMouseEvent(child, static_cast<QMouseEvent *>(event)); break; @@ -645,12 +632,6 @@ bool QQuickDrawer::childMouseEventFilter(QQuickItem *child, QEvent *event) return false; } -void QQuickDrawer::mousePressEvent(QMouseEvent *event) -{ - Q_D(QQuickDrawer); - d->handleMousePressEvent(d->popupItem, event); -} - void QQuickDrawer::mouseMoveEvent(QMouseEvent *event) { Q_D(QQuickDrawer); @@ -669,8 +650,6 @@ bool QQuickDrawer::overlayEvent(QQuickItem *item, QEvent *event) event->ignore(); return false; - case QEvent::MouseButtonPress: - return d->handleMousePressEvent(item, static_cast<QMouseEvent *>(event)); case QEvent::MouseMove: return d->handleMouseMoveEvent(item, static_cast<QMouseEvent *>(event)); default: diff --git a/src/quicktemplates2/qquickdrawer_p.h b/src/quicktemplates2/qquickdrawer_p.h index 74b92717..38b425be 100644 --- a/src/quicktemplates2/qquickdrawer_p.h +++ b/src/quicktemplates2/qquickdrawer_p.h @@ -86,7 +86,6 @@ Q_SIGNALS: protected: bool childMouseEventFilter(QQuickItem *child, QEvent *event) override; - void mousePressEvent(QMouseEvent *event) override; void mouseMoveEvent(QMouseEvent *event) override; bool overlayEvent(QQuickItem *item, QEvent *event) override; diff --git a/src/quicktemplates2/qquickdrawer_p_p.h b/src/quicktemplates2/qquickdrawer_p_p.h index 5117ef77..9fca728f 100644 --- a/src/quicktemplates2/qquickdrawer_p_p.h +++ b/src/quicktemplates2/qquickdrawer_p_p.h @@ -78,7 +78,6 @@ public: void handleRelease(const QPointF &point, ulong timestamp) override; void handleUngrab() override; - bool handleMousePressEvent(QQuickItem *item, QMouseEvent *event); bool handleMouseMoveEvent(QQuickItem *item, QMouseEvent *event); bool prepareEnterTransition() override; |