aboutsummaryrefslogtreecommitdiffstats
path: root/src/quicktemplates2/qquickrangeslider.cpp
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2020-08-04 12:53:00 +0200
committerMitch Curtis <mitch.curtis@qt.io>2021-06-09 11:22:02 +0200
commitfb6baf03faf1ffdda5917b9daa9e9ed0f821fa8a (patch)
treed780b86780bff1460f5cd56fb6d833313748e3ba /src/quicktemplates2/qquickrangeslider.cpp
parenta01fbae26559adadc9028b16dc8f6e7acce61495 (diff)
AbstractButton: emit doubleClicked() for touch events
[ChangeLog][Controls][AbstractButton] doubleClicked() is now also emitted for touch events. Fixes: QTBUG-82146 Change-Id: Ie1e24d291bd4b592edd91fc762da8636e08698df Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickrangeslider.cpp')
-rw-r--r--src/quicktemplates2/qquickrangeslider.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/quicktemplates2/qquickrangeslider.cpp b/src/quicktemplates2/qquickrangeslider.cpp
index 0455ab21..2348e642 100644
--- a/src/quicktemplates2/qquickrangeslider.cpp
+++ b/src/quicktemplates2/qquickrangeslider.cpp
@@ -380,9 +380,9 @@ public:
#if QT_CONFIG(quicktemplates2_multitouch)
bool acceptTouch(const QTouchEvent::TouchPoint &point) override;
#endif
- void handlePress(const QPointF &point) override;
- void handleMove(const QPointF &point) override;
- void handleRelease(const QPointF &point) override;
+ void handlePress(const QPointF &point, ulong timestamp) override;
+ void handleMove(const QPointF &point, ulong timestamp) override;
+ void handleRelease(const QPointF &point, ulong timestamp) override;
void handleUngrab() override;
void updateHover(const QPointF &pos);
@@ -467,10 +467,10 @@ bool QQuickRangeSliderPrivate::acceptTouch(const QTouchEvent::TouchPoint &point)
}
#endif
-void QQuickRangeSliderPrivate::handlePress(const QPointF &point)
+void QQuickRangeSliderPrivate::handlePress(const QPointF &point, ulong timestamp)
{
Q_Q(QQuickRangeSlider);
- QQuickControlPrivate::handlePress(point);
+ QQuickControlPrivate::handlePress(point, timestamp);
pressPoint = point;
QQuickItem *firstHandle = first->handle();
@@ -528,10 +528,10 @@ void QQuickRangeSliderPrivate::handlePress(const QPointF &point)
}
}
-void QQuickRangeSliderPrivate::handleMove(const QPointF &point)
+void QQuickRangeSliderPrivate::handleMove(const QPointF &point, ulong timestamp)
{
Q_Q(QQuickRangeSlider);
- QQuickControlPrivate::handleMove(point);
+ QQuickControlPrivate::handleMove(point, timestamp);
QQuickRangeSliderNode *pressedNode = QQuickRangeSliderPrivate::pressedNode(touchId);
if (pressedNode) {
const qreal oldPos = pressedNode->position();
@@ -548,10 +548,10 @@ void QQuickRangeSliderPrivate::handleMove(const QPointF &point)
}
}
-void QQuickRangeSliderPrivate::handleRelease(const QPointF &point)
+void QQuickRangeSliderPrivate::handleRelease(const QPointF &point, ulong timestamp)
{
Q_Q(QQuickRangeSlider);
- QQuickControlPrivate::handleRelease(point);
+ QQuickControlPrivate::handleRelease(point, timestamp);
pressPoint = QPointF();
QQuickRangeSliderNode *pressedNode = QQuickRangeSliderPrivate::pressedNode(touchId);
@@ -1182,7 +1182,7 @@ void QQuickRangeSlider::mousePressEvent(QMouseEvent *event)
{
Q_D(QQuickRangeSlider);
QQuickControl::mousePressEvent(event);
- d->handleMove(event->position());
+ d->handleMove(event->position(), event->timestamp());
setKeepMouseGrab(true);
}
@@ -1198,7 +1198,7 @@ void QQuickRangeSlider::touchEvent(QTouchEvent *event)
switch (point.state()) {
case QEventPoint::Pressed:
- d->handlePress(point.position());
+ d->handlePress(point.position(), event->timestamp());
break;
case QEventPoint::Updated:
if (!keepTouchGrab()) {
@@ -1208,10 +1208,10 @@ void QQuickRangeSlider::touchEvent(QTouchEvent *event)
setKeepTouchGrab(QQuickWindowPrivate::dragOverThreshold(point.position().y() - point.pressPosition().y(), Qt::YAxis, &point, qRound(d->touchDragThreshold)));
}
if (keepTouchGrab())
- d->handleMove(point.position());
+ d->handleMove(point.position(), event->timestamp());
break;
case QEventPoint::Released:
- d->handleRelease(point.position());
+ d->handleRelease(point.position(), event->timestamp());
break;
default:
break;