diff options
| -rw-r--r-- | src/templates/qquickslider.cpp | 10 | ||||
| -rw-r--r-- | tests/auto/controls/data/tst_slider.qml | 32 |
2 files changed, 40 insertions, 2 deletions
diff --git a/src/templates/qquickslider.cpp b/src/templates/qquickslider.cpp index b62b8280..b197b4a1 100644 --- a/src/templates/qquickslider.cpp +++ b/src/templates/qquickslider.cpp @@ -110,9 +110,15 @@ qreal QQuickSliderPrivate::valueAt(qreal position) const qreal QQuickSliderPrivate::snapPosition(qreal position) const { - if (qFuzzyIsNull(stepSize)) + const qreal range = from + (to - from); + if (qFuzzyIsNull(range)) return position; - return qRound(position / stepSize) * stepSize; + + const qreal effectiveStep = stepSize / range; + if (qFuzzyIsNull(effectiveStep)) + return position; + + return qRound(position / effectiveStep) * effectiveStep; } qreal QQuickSliderPrivate::positionAt(const QPoint &point) const diff --git a/tests/auto/controls/data/tst_slider.qml b/tests/auto/controls/data/tst_slider.qml index 5957442f..53e2fb8f 100644 --- a/tests/auto/controls/data/tst_slider.qml +++ b/tests/auto/controls/data/tst_slider.qml @@ -439,4 +439,36 @@ TestCase { control.destroy() } + + function test_snapMode_data() { + return [ + { tag: "NoSnap", snapMode: Slider.NoSnap, values: [0, 0, 0.25], positions: [0, 0.1, 0.1] }, + { tag: "SnapAlways", snapMode: Slider.SnapAlways, values: [0, 0, 0.2], positions: [0, 0.1, 0.1] }, + { tag: "SnapOnRelease", snapMode: Slider.SnapOnRelease, values: [0, 0, 0.2], positions: [0, 0.1, 0.1] } + ] + } + + function test_snapMode(data) { + var control = slider.createObject(testCase, {snapMode: data.snapMode, from: 0, to: 2, stepSize: 0.2}) + verify(control) + + function sliderCompare(left, right) { + return Math.abs(left - right) < 0.05 + } + + mousePress(control, control.leftPadding) + compare(control.value, data.values[0]) + compare(control.position, data.positions[0]) + + mouseMove(control, control.leftPadding + 0.15 * (control.availableWidth + control.handle.width / 2)) + + verify(sliderCompare(control.value, data.values[1])) + verify(sliderCompare(control.position, data.positions[1])) + + mouseRelease(control, control.leftPadding + 0.15 * (control.availableWidth + control.handle.width / 2)) + verify(sliderCompare(control.value, data.values[2])) + verify(sliderCompare(control.position, data.positions[2])) + + control.destroy() + } } |