aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/Slider.qml
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2016-05-11 23:47:33 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2016-05-12 14:52:56 +0000
commit5d7fe7e0687b5cfcafd25e9f0ce0ade38cc0ad4f (patch)
tree22b5582fac75751677d57d153e12c5d0277611c6 /src/imports/controls/Slider.qml
parent6954164566e760894ed2a6f167fdd336d9dd53dd (diff)
Default: implement some missing disabled states
Change-Id: I590d8bd526661b3587a87cb3eeb48e90538afdf7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/Slider.qml')
-rw-r--r--src/imports/controls/Slider.qml5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/imports/controls/Slider.qml b/src/imports/controls/Slider.qml
index fd83d8e5..0d4b7125 100644
--- a/src/imports/controls/Slider.qml
+++ b/src/imports/controls/Slider.qml
@@ -56,9 +56,9 @@ T.Slider {
implicitWidth: 28
implicitHeight: 28
radius: width / 2
- color: control.pressed ? (control.visualFocus ? "#cce0ff" : "#e4e4e4") : (control.visualFocus ? "#f0f6ff" : "#f6f6f6")
+ color: control.enabled ? (control.pressed ? (control.visualFocus ? "#cce0ff" : "#e4e4e4") : (control.visualFocus ? "#f0f6ff" : "#f6f6f6")) : "#fdfdfd"
border.width: control.visualFocus ? 2 : 1
- border.color: control.visualFocus ? "#0066ff" : (control.pressed ? "#26282a" : "#353637")
+ border.color: control.enabled ? (control.visualFocus ? "#0066ff" : (control.pressed ? "#26282a" : "#353637")) : "#d6d6d6"
readonly property bool horizontal: control.orientation === Qt.Horizontal
}
@@ -75,6 +75,7 @@ T.Slider {
radius: 3
border.color: "#353637"
color: "#ffffff"
+ opacity: control.enabled ? 1 : 0.2
scale: horizontal && control.mirrored ? -1 : 1
readonly property bool horizontal: control.orientation === Qt.Horizontal