diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-05-20 11:11:42 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-05-20 11:11:42 +0200 |
| commit | eb70f8179628fe1298ff8fa0032589513e28e303 (patch) | |
| tree | 690140ebca31c20480c358317fd41541ef26d07b /src/imports/controls/RangeSlider.qml | |
| parent | ea043d5d838f638e4bc5461aa23fb69a1a9e1eb6 (diff) | |
| parent | edded3b5179de4e387f8bb173311bf39df9c43d7 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/imports/controls/ApplicationWindow.qml
src/imports/controls/material/ApplicationWindow.qml
src/imports/controls/universal/ApplicationWindow.qml
src/imports/templates/qtquicktemplates2plugin.cpp
Change-Id: I9041c69f4ce5dab1d1b994d2318feddb696e56bf
Diffstat (limited to 'src/imports/controls/RangeSlider.qml')
| -rw-r--r-- | src/imports/controls/RangeSlider.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/controls/RangeSlider.qml b/src/imports/controls/RangeSlider.qml index 75c27d91..3a3c2202 100644 --- a/src/imports/controls/RangeSlider.qml +++ b/src/imports/controls/RangeSlider.qml @@ -75,7 +75,7 @@ T.RangeSlider { border.width: activeFocus ? 2 : 1 border.color: control.enabled ? (activeFocus ? Default.focusColor - : (control.first.pressed ? Default.indicatorFramePressedColor : Default.indicatorFrameColor)) : Default.indicatorFrameDisabledColor + : (control.second.pressed ? Default.indicatorFramePressedColor : Default.indicatorFrameColor)) : Default.indicatorFrameDisabledColor color: control.enabled ? (second.pressed ? (activeFocus ? Default.focusPressedColor : Default.indicatorPressedColor) : (activeFocus ? Default.focusLightColor : Default.backgroundColor)) : Default.indicatorDisabledColor |