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>

1 files changed, 2 insertions, 23 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: