From a2aff9c3c8800d265757d5171cb4f39c81328edd Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Mon, 8 Feb 2016 12:51:09 +0100 Subject: RangeSlider: fix stepSize handling when snapping is enabled Same as the recent fix for Slider. The step size needs to be normalized when added to or subtracted from the position. Change-Id: I490d105f88db361fb0e1888017e1717e9d79e4c8 Reviewed-by: Mitch Curtis --- tests/auto/controls/data/tst_rangeslider.qml | 37 ++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'tests/auto/controls/data/tst_rangeslider.qml') diff --git a/tests/auto/controls/data/tst_rangeslider.qml b/tests/auto/controls/data/tst_rangeslider.qml index 2a77d205..09ccb3be 100644 --- a/tests/auto/controls/data/tst_rangeslider.qml +++ b/tests/auto/controls/data/tst_rangeslider.qml @@ -586,4 +586,41 @@ 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 = sliderComponent.createObject(testCase, {snapMode: data.snapMode, from: 0, to: 2, stepSize: 0.2}) + verify(control) + + control.first.value = 0 + control.second.value = 2 + + function sliderCompare(left, right) { + return Math.abs(left - right) < 0.05 + } + + mousePress(control, control.first.handle.x, control.first.handle.y) + compare(control.first.pressed, true) + compare(control.first.value, data.values[0]) + compare(control.first.position, data.positions[0]) + + mouseMove(control, control.leftPadding + 0.15 * (control.availableWidth + control.first.handle.width / 2)) + compare(control.first.pressed, true) + verify(sliderCompare(control.first.value, data.values[1])) + verify(sliderCompare(control.first.position, data.positions[1])) + + mouseRelease(control, control.leftPadding + 0.15 * (control.availableWidth + control.first.handle.width / 2)) + compare(control.first.pressed, false) + verify(sliderCompare(control.first.value, data.values[2])) + verify(sliderCompare(control.first.position, data.positions[2])) + + control.destroy() + } } -- cgit v1.2.3