Merge remote-tracking branch 'origin/5.10' into dev

Change-Id: I59e9e2044184f96f1e66577f6f639d028a825b9e

1 files changed, 6 insertions, 14 deletions

diff --git a/src/imports/controls/RangeSlider.qml b/src/imports/controls/RangeSlider.qml
index c2b2edb6..f2c9266e 100644
--- a/src/imports/controls/RangeSlider.qml
+++ b/src/imports/controls/RangeSlider.qml
@@ -58,12 +58,8 @@ T.RangeSlider {
         implicitHeight: 28
         radius: width / 2
         border.width: activeFocus ? 2 : 1
-        border.color: control.enabled ? (activeFocus
-            ? Default.focusColor
-            : (control.first.pressed ? Default.indicatorFramePressedColor : Default.indicatorFrameColor)) : Default.indicatorFrameDisabledColor
-        color: control.enabled ? (first.pressed
-            ? (activeFocus ? Default.focusPressedColor : Default.indicatorPressedColor)
-            : (activeFocus ? Default.focusLightColor : Default.backgroundColor)) : Default.indicatorDisabledColor
+        border.color: activeFocus ? control.palette.highlight : control.enabled ? control.palette.mid : control.palette.midlight
+        color: control.first.pressed ? control.palette.light : control.palette.window
     }
 
     second.handle: Rectangle {
@@ -73,12 +69,8 @@ T.RangeSlider {
         implicitHeight: 28
         radius: width / 2
         border.width: activeFocus ? 2 : 1
-        border.color: control.enabled ? (activeFocus
-            ? Default.focusColor
-            : (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
+        border.color: activeFocus ? control.palette.highlight : control.enabled ? control.palette.mid : control.palette.midlight
+        color: control.second.pressed ? control.palette.light : control.palette.window
     }
 
     background: Rectangle {
@@ -89,7 +81,7 @@ T.RangeSlider {
         width: control.horizontal ? control.availableWidth : implicitWidth
         height: control.horizontal ? implicitHeight : control.availableHeight
         radius: 3
-        color: Default.buttonColor
+        color: control.palette.midlight
         scale: control.horizontal && control.mirrored ? -1 : 1
 
         Rectangle {
@@ -98,7 +90,7 @@ T.RangeSlider {
             width: control.horizontal ? control.second.position * parent.width - control.first.position * parent.width - 6 : 6
             height: control.horizontal ? 6 : control.second.position * parent.height - control.first.position * parent.height - 6
 
-            color: Default.textColor
+            color: control.palette.dark
         }
     }
 }