diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-04-19 17:30:08 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-04-20 09:47:27 +0000 |
commit | 9ba2c26a54b8180a822ab23b85fa2967bfa05683 (patch) | |
tree | 50510177339046269d1b799ff8a87a8304ee0f74 /src/quicktemplates2/qquickabstractbutton.cpp | |
parent | 508df25faab2adb1565b2ac8a92a0cf768add69f (diff) |
Override QQuickControlPrivate::handleXxx()
Change-Id: I5c5be24142a758637e18df24b43847a8c6079346
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/quicktemplates2/qquickabstractbutton.cpp')
-rw-r--r-- | src/quicktemplates2/qquickabstractbutton.cpp | 86 |
1 files changed, 5 insertions, 81 deletions
diff --git a/src/quicktemplates2/qquickabstractbutton.cpp b/src/quicktemplates2/qquickabstractbutton.cpp index 8f2fb3cf..0207d2f9 100644 --- a/src/quicktemplates2/qquickabstractbutton.cpp +++ b/src/quicktemplates2/qquickabstractbutton.cpp @@ -133,6 +133,7 @@ QQuickAbstractButtonPrivate::QQuickAbstractButtonPrivate() void QQuickAbstractButtonPrivate::handlePress(const QPointF &point) { Q_Q(QQuickAbstractButton); + QQuickControlPrivate::handlePress(point); pressPoint = point; q->setPressed(true); @@ -149,6 +150,7 @@ void QQuickAbstractButtonPrivate::handlePress(const QPointF &point) void QQuickAbstractButtonPrivate::handleMove(const QPointF &point) { Q_Q(QQuickAbstractButton); + QQuickControlPrivate::handleMove(point); q->setPressed(keepPressed || q->contains(point)); if (!pressed && autoRepeat) @@ -160,6 +162,7 @@ void QQuickAbstractButtonPrivate::handleMove(const QPointF &point) void QQuickAbstractButtonPrivate::handleRelease(const QPointF &point) { Q_Q(QQuickAbstractButton); + QQuickControlPrivate::handleRelease(point); bool wasPressed = pressed; q->setPressed(false); pressButtons = Qt::NoButton; @@ -184,6 +187,7 @@ void QQuickAbstractButtonPrivate::handleRelease(const QPointF &point) void QQuickAbstractButtonPrivate::handleUngrab() { Q_Q(QQuickAbstractButton); + QQuickControlPrivate::handleUngrab(); pressButtons = Qt::NoButton; if (!pressed) return; @@ -616,23 +620,8 @@ void QQuickAbstractButton::keyReleaseEvent(QKeyEvent *event) void QQuickAbstractButton::mousePressEvent(QMouseEvent *event) { Q_D(QQuickAbstractButton); - QQuickControl::mousePressEvent(event); d->pressButtons = event->buttons(); - d->handlePress(event->localPos()); -} - -void QQuickAbstractButton::mouseMoveEvent(QMouseEvent *event) -{ - Q_D(QQuickAbstractButton); - QQuickControl::mouseMoveEvent(event); - d->handleMove(event->localPos()); -} - -void QQuickAbstractButton::mouseReleaseEvent(QMouseEvent *event) -{ - Q_D(QQuickAbstractButton); - QQuickControl::mouseReleaseEvent(event); - d->handleRelease(event->localPos()); + QQuickControl::mousePressEvent(event); } void QQuickAbstractButton::mouseDoubleClickEvent(QMouseEvent *event) @@ -641,13 +630,6 @@ void QQuickAbstractButton::mouseDoubleClickEvent(QMouseEvent *event) emit doubleClicked(); } -void QQuickAbstractButton::mouseUngrabEvent() -{ - Q_D(QQuickAbstractButton); - QQuickControl::mouseUngrabEvent(); - d->handleUngrab(); -} - void QQuickAbstractButton::timerEvent(QTimerEvent *event) { Q_D(QQuickAbstractButton); @@ -665,64 +647,6 @@ void QQuickAbstractButton::timerEvent(QTimerEvent *event) } } -void QQuickAbstractButton::touchEvent(QTouchEvent *event) -{ - Q_D(QQuickAbstractButton); - switch (event->type()) { - case QEvent::TouchBegin: - if (d->touchId == -1) { - const QTouchEvent::TouchPoint point = event->touchPoints().first(); - d->touchId = point.id(); - d->handlePress(point.pos()); - } - break; - - case QEvent::TouchUpdate: - for (const QTouchEvent::TouchPoint &point : event->touchPoints()) { - if (point.id() != d->touchId) - continue; - - switch (point.state()) { - case Qt::TouchPointPressed: - d->handlePress(point.pos()); - break; - case Qt::TouchPointMoved: - d->handleMove(point.pos()); - break; - case Qt::TouchPointReleased: - d->handleRelease(point.pos()); - break; - default: - break; - } - } - break; - - case QEvent::TouchEnd: - for (const QTouchEvent::TouchPoint &point : event->touchPoints()) { - if (point.id() == d->touchId) - d->handleRelease(point.pos()); - } - break; - - case QEvent::TouchCancel: - d->handleUngrab(); - break; - - default: - break; - } - - QQuickControl::touchEvent(event); -} - -void QQuickAbstractButton::touchUngrabEvent() -{ - Q_D(QQuickAbstractButton); - QQuickControl::touchUngrabEvent(); - d->handleUngrab(); -} - void QQuickAbstractButton::buttonChange(ButtonChange change) { Q_D(QQuickAbstractButton); |