aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/Slider.qml
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-04-24 01:02:24 +0200
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2015-04-23 23:12:08 +0000
commite9476ae5b9385ce5a6b4a55f984543aa180492bd (patch)
treea08daab06213e8347f724a0e939c0b210eb357e0 /src/imports/controls/Slider.qml
parent2df3b1b930e3d151e14ace3f464b9caeadff0b04 (diff)
Use Theme.disabledColor to get sensible looks in disabled state
Change-Id: I28831c979f8fa040fc3388eec6f2256930a3d91d Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/Slider.qml')
-rw-r--r--src/imports/controls/Slider.qml8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/controls/Slider.qml b/src/imports/controls/Slider.qml
index e8a68c5a..284a0b2f 100644
--- a/src/imports/controls/Slider.qml
+++ b/src/imports/controls/Slider.qml
@@ -71,9 +71,9 @@ AbstractSlider {
height: 12
radius: width / 2
- color: Qt.tint(Qt.tint(control.Theme.accentColor,
- control.activeFocus ? control.Theme.focusColor : "transparent"),
- control.pressed ? control.Theme.pressColor : "transparent")
+ color: Qt.tint(!control.enabled ? control.Theme.disabledColor :
+ control.activeFocus ? control.Theme.focusColor : control.Theme.accentColor,
+ control.pressed ? control.Theme.pressColor : "transparent")
}
}
@@ -97,7 +97,7 @@ AbstractSlider {
width: parent.horizontal ? control.position * parent.width - 4 : 2
height: parent.horizontal ? 2 : control.position * parent.height - 4
- color: control.Theme.accentColor
+ color: control.enabled ? control.Theme.accentColor : control.Theme.disabledColor
radius: control.Theme.roundness
}
}