diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2016-05-13 13:21:49 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2016-05-19 14:44:14 +0000 |
| commit | 4ecf0a7da5acad1cd49b53e15c5716770b5e3c2b (patch) | |
| tree | f28b545f8422f0d0addb82d0c5121d6c3649c67c /src/imports/controls/SwitchIndicator.qml | |
| parent | 56a162cc1ac4702f2a76cbc7dab0acd00aa1ca30 (diff) | |
Remove frames from certain controls and lighten others
E.g. Button and Popups look awkward with frames. Other controls
need them, but they're currently too dark. This patch gives them
gentler shades.
Change-Id: I1c3c486935180300b8233a028d25742fe8535995
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/imports/controls/SwitchIndicator.qml')
| -rw-r--r-- | src/imports/controls/SwitchIndicator.qml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/imports/controls/SwitchIndicator.qml b/src/imports/controls/SwitchIndicator.qml index f03fa86c..f11f7147 100644 --- a/src/imports/controls/SwitchIndicator.qml +++ b/src/imports/controls/SwitchIndicator.qml @@ -47,10 +47,10 @@ 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") + opacity: control.enabled ? 1 : 0.3 + color: control.checked ? (control.visualFocus ? "#0066ff" : "#353637") : "#e0e0e0" + border.width: control.visualFocus ? 2 : 0 + border.color: "#0066ff" } Rectangle { @@ -59,12 +59,12 @@ Item { width: 28 height: 28 radius: 16 - color: control.enabled ? (control.pressed ? (control.visualFocus ? "#cce0ff" : "#e4e4e4") : (control.visualFocus ? "#f0f6ff" : "#f6f6f6")) : "#fdfdfd" + color: control.enabled ? (control.down ? (control.visualFocus ? "#cce0ff" : "#f6f6f6") : (control.visualFocus ? "#f0f6ff" : "#ffffff")) : "#fdfdfd" border.width: control.visualFocus ? 2 : 1 - border.color: control.enabled ? (control.visualFocus ? "#0066ff" : (control.pressed ? "#26282a" : "#353637")) : "#d6d6d6" + border.color: control.enabled ? (control.visualFocus ? "#0066ff" : (control.down ? "#808080" : "#909090")) : "#d6d6d6" Behavior on x { - enabled: !control.pressed + enabled: !control.down SmoothedAnimation { velocity: 200 } } } |