diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-04-04 18:11:51 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-04-05 09:08:25 +0000 |
| commit | 4a37f67ec820cf9a972218d4244fc160a3697453 (patch) | |
| tree | b65b6d51756040f83411546ef693cd25c17b59c2 /src/quicktemplates2/qquickrangeslider.cpp | |
| parent | 790cf8d3b4078dc1bbc1afb338f1bf197598c4d0 (diff) | |
RangeSlider: react immediately when using a mouse
The initial drag threshold is a necessary evil on touch to avoid
conflicting with flickables, but leads to bad experience (QTBUG-47081)
when using a mouse. Now that we have separate mouse and touch handling,
we can apply immediate moves when using a mouse, but keep the old
behavior on touch.
Task-number: QTBUG-59920
Change-Id: Ida36eed1f59a30173e3a2c53b55e044a87c98d8b
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickrangeslider.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickrangeslider.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quicktemplates2/qquickrangeslider.cpp b/src/quicktemplates2/qquickrangeslider.cpp index 2d3c464f..1c530c7c 100644 --- a/src/quicktemplates2/qquickrangeslider.cpp +++ b/src/quicktemplates2/qquickrangeslider.cpp @@ -456,8 +456,6 @@ void QQuickRangeSliderPrivate::handlePress(const QPointF &point, int touchId) void QQuickRangeSliderPrivate::handleMove(const QPointF &point, int touchId) { Q_Q(QQuickRangeSlider); - if (!q->keepMouseGrab() && !q->keepTouchGrab()) - return; QQuickRangeSliderNode *pressedNode = QQuickRangeSliderPrivate::pressedNode(touchId); if (pressedNode) { qreal pos = positionAt(q, pressedNode->handle(), point); @@ -953,6 +951,7 @@ void QQuickRangeSlider::mousePressEvent(QMouseEvent *event) Q_D(QQuickRangeSlider); QQuickControl::mousePressEvent(event); d->handlePress(event->localPos()); + d->handleMove(event->localPos()); } void QQuickRangeSlider::mouseMoveEvent(QMouseEvent *event) @@ -965,7 +964,8 @@ void QQuickRangeSlider::mouseMoveEvent(QMouseEvent *event) else setKeepMouseGrab(QQuickWindowPrivate::dragOverThreshold(event->localPos().y() - d->pressPoint.y(), Qt::YAxis, event)); } - d->handleMove(event->localPos()); + if (keepMouseGrab()) + d->handleMove(event->localPos()); } void QQuickRangeSlider::mouseReleaseEvent(QMouseEvent *event) |