diff options
author | J-P Nurmi <jpnurmi@digia.com> | 2014-06-25 10:27:39 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@digia.com> | 2014-06-25 10:27:39 +0200 |
commit | 91caf7531476d16c1c7a6d22705cb36ac93c5ab7 (patch) | |
tree | e4f67bcd61c55ba2b8cb4a4d01b10f69837c74e8 /src/controls/Slider.qml | |
parent | 1f0def9e8feca180680c1344cef6cf250b7630ba (diff) | |
parent | 6b876b21cd23f2af879543edf773dac41b4d0e97 (diff) | |
download | qtquickcontrols-91caf7531476d16c1c7a6d22705cb36ac93c5ab7.tar.gz |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
.qmake.conf
src/controls/Styles/Desktop/SpinBoxStyle.qml
Change-Id: Ia501c1388a2af9f273ec2742abbfc766717ad9e6
Diffstat (limited to 'src/controls/Slider.qml')
-rw-r--r-- | src/controls/Slider.qml | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/controls/Slider.qml b/src/controls/Slider.qml index 2838ed7e..af5b89cd 100644 --- a/src/controls/Slider.qml +++ b/src/controls/Slider.qml @@ -237,18 +237,22 @@ Control { onMouseXChanged: { if (pressed && __horizontal) { var pos = clamp (mouse.x + clickOffset - fakeHandle.width/2) - fakeHandle.x = pos - if (Math.abs(mouse.x - pressX) >= Settings.dragThreshold) + var overThreshold = Math.abs(mouse.x - pressX) >= Settings.dragThreshold + if (overThreshold) preventStealing = true + if (overThreshold || !Settings.hasTouchScreen) + fakeHandle.x = pos } } onMouseYChanged: { if (pressed && !__horizontal) { var pos = clamp (mouse.y + clickOffset- fakeHandle.height/2) - fakeHandle.y = pos - if (Math.abs(mouse.y - pressY) >= Settings.dragThreshold) + var overThreshold = Math.abs(mouse.y - pressY) >= Settings.dragThreshold + if (overThreshold) preventStealing = true + if (overThreshold || !Settings.hasTouchScreen) + fakeHandle.y = pos } } |