diff options
| -rw-r--r-- | src/imports/controls/RangeSlider.qml | 9 | ||||
| -rw-r--r-- | src/imports/controls/Slider.qml | 5 | ||||
| -rw-r--r-- | src/imports/controls/SwitchIndicator.qml | 5 |
3 files changed, 11 insertions, 8 deletions
diff --git a/src/imports/controls/RangeSlider.qml b/src/imports/controls/RangeSlider.qml index 096df0b6..e747e077 100644 --- a/src/imports/controls/RangeSlider.qml +++ b/src/imports/controls/RangeSlider.qml @@ -59,8 +59,8 @@ T.RangeSlider { implicitHeight: 28 radius: width / 2 border.width: activeFocus ? 2 : 1 - border.color: activeFocus ? "#0066ff" : (control.first.pressed ? "#26282a" : "#353637") - color: first.pressed ? (activeFocus ? "#cce0ff" : "#e4e4e4") : (activeFocus ? "#f0f6ff" : "#f6f6f6") + border.color: control.enabled ? (activeFocus ? "#0066ff" : (control.first.pressed ? "#26282a" : "#353637")) : "#d6d6d6" + color: control.enabled ? (first.pressed ? (activeFocus ? "#cce0ff" : "#e4e4e4") : (activeFocus ? "#f0f6ff" : "#f6f6f6")) : "#fdfdfd" readonly property bool horizontal: control.orientation === Qt.Horizontal } @@ -74,8 +74,8 @@ T.RangeSlider { implicitHeight: 28 radius: width / 2 border.width: activeFocus ? 2 : 1 - border.color: activeFocus ? "#0066ff" : (control.second.pressed ? "#26282a" : "#353637") - color: second.pressed ? (activeFocus ? "#cce0ff" : "#e4e4e4") : (activeFocus ? "#f0f6ff" : "#f6f6f6") + border.color: control.enabled ? (activeFocus ? "#0066ff" : (control.first.pressed ? "#26282a" : "#353637")) : "#d6d6d6" + color: control.enabled ? (second.pressed ? (activeFocus ? "#cce0ff" : "#e4e4e4") : (activeFocus ? "#f0f6ff" : "#f6f6f6")) : "#fdfdfd" readonly property bool horizontal: control.orientation === Qt.Horizontal } @@ -92,6 +92,7 @@ T.RangeSlider { 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 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 diff --git a/src/imports/controls/SwitchIndicator.qml b/src/imports/controls/SwitchIndicator.qml index ead6b64c..f03fa86c 100644 --- a/src/imports/controls/SwitchIndicator.qml +++ b/src/imports/controls/SwitchIndicator.qml @@ -47,6 +47,7 @@ Item { width: 56 height: 16 radius: 8 + opacity: control.enabled ? 1 : 0.2 color: control.checked ? (control.visualFocus ? "#0066ff" : "#353637") : "#ffffff" border.width: control.visualFocus ? 2 : 1 border.color: control.checked ? "transparent" : (control.visualFocus ? "#0066ff" : "#353637") @@ -58,9 +59,9 @@ Item { width: 28 height: 28 radius: 16 - 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" Behavior on x { enabled: !control.pressed |