From 5d7fe7e0687b5cfcafd25e9f0ce0ade38cc0ad4f Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 11 May 2016 23:47:33 +0200 Subject: Default: implement some missing disabled states Change-Id: I590d8bd526661b3587a87cb3eeb48e90538afdf7 Reviewed-by: Mitch Curtis --- src/imports/controls/SwitchIndicator.qml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/imports/controls/SwitchIndicator.qml') 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 -- cgit v1.2.3