From 7b165203783efb4d59f0d68f14e8a211fef14d87 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 26 Sep 2017 09:51:56 +0200 Subject: Default: replace remaining Default.focusColor with palette.highlight Task-number: QTBUG-63369 Change-Id: I37c1f4298fa01b907dfcb28757cd5d7ded182192 Reviewed-by: Mitch Curtis --- src/imports/controls/RangeSlider.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/imports/controls/RangeSlider.qml') diff --git a/src/imports/controls/RangeSlider.qml b/src/imports/controls/RangeSlider.qml index 0f7c2f4c..3fbc9018 100644 --- a/src/imports/controls/RangeSlider.qml +++ b/src/imports/controls/RangeSlider.qml @@ -59,7 +59,7 @@ T.RangeSlider { radius: width / 2 border.width: activeFocus ? 2 : 1 border.color: control.enabled ? (activeFocus - ? Default.focusColor + ? control.palette.highlight : (control.first.pressed ? Default.indicatorFramePressedColor : Default.indicatorFrameColor)) : Default.indicatorFrameDisabledColor color: control.enabled ? (first.pressed ? (activeFocus ? Default.focusPressedColor : Default.indicatorPressedColor) @@ -74,7 +74,7 @@ T.RangeSlider { radius: width / 2 border.width: activeFocus ? 2 : 1 border.color: control.enabled ? (activeFocus - ? Default.focusColor + ? control.palette.highlight : (control.second.pressed ? Default.indicatorFramePressedColor : Default.indicatorFrameColor)) : Default.indicatorFrameDisabledColor color: control.enabled ? (second.pressed ? (activeFocus ? Default.focusPressedColor : Default.indicatorPressedColor) -- cgit v1.2.3 From bf4d5c7091889cd4f253d27c479687df5348b817 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 27 Sep 2017 09:29:44 +0200 Subject: Default: make RangeSlider use palettes Task-number: QTBUG-63369 Change-Id: I1f830dbfa2a723950fe0d10912fa459ab9968517 Reviewed-by: Mitch Curtis --- src/imports/controls/RangeSlider.qml | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'src/imports/controls/RangeSlider.qml') diff --git a/src/imports/controls/RangeSlider.qml b/src/imports/controls/RangeSlider.qml index 3fbc9018..c8b88a97 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 - ? control.palette.highlight - : (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 - ? control.palette.highlight - : (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 } } } -- cgit v1.2.3