diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-17 23:08:00 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-18 22:11:24 +0200 |
| commit | d9aae9ff99d20b58487b0a48801864d13115363b (patch) | |
| tree | e98089900164f7a1008e6fb59d1815dc9eab8d2c /src/controls/Slider.qml | |
| parent | 49bd4b76d08ec11d08105ca71e8dda4f8d459b5c (diff) | |
| parent | c2356328f88b044c8956fe7860c4c04fca4f2c30 (diff) | |
| download | qtquickcontrols-d9aae9ff99d20b58487b0a48801864d13115363b.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/controls/Private/qquickrangemodel.cpp
src/controls/Private/qquickrangemodel_p.h
src/controls/Private/qquickrangemodel_p_p.h
src/layouts/qquicklayout.cpp
tests/auto/controls/data/tst_rangemodel.qml
Change-Id: I9c8f6326c6edf9ebb18dd538f76830e1b439ba8e
Diffstat (limited to 'src/controls/Slider.qml')
| -rw-r--r-- | src/controls/Slider.qml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/controls/Slider.qml b/src/controls/Slider.qml index f38db0e4..4023929a 100644 --- a/src/controls/Slider.qml +++ b/src/controls/Slider.qml @@ -176,9 +176,11 @@ Control { /*! \internal The extra arguments positionAtMinimum and positionAtMaximum are there to force - re-evaluation of the handle position when the constraints change (QTBUG-41255). + re-evaluation of the handle position when the constraints change (QTBUG-41255), + and the same for range.minimumValue (QTBUG-51765). */ - property real __handlePos: range.valueForPosition(__horizontal ? fakeHandle.x : fakeHandle.y, range.positionAtMinimum, range.positionAtMaximum) + property real __handlePos: range.valueForPosition(__horizontal ? fakeHandle.x : fakeHandle.y, + range.positionAtMinimum, range.positionAtMaximum, range.minimumValue) activeFocusOnTab: true |