diff options
author | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2015-11-23 14:17:32 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-11-26 17:28:02 +0000 |
commit | f556f3ea80ebc41cb6a49560e83965c8889b8974 (patch) | |
tree | f36be3e2db498fefe582cde1930fb9272f49fed0 /src/imports/controls/CheckBox.qml | |
parent | d1a3ab2a9d391bbb4ec07920bb243d21910a3e22 (diff) |
Implement more of default style design
Change-Id: Ieaa2fa1b876d75f94f48a7fce0c47c166b969d57
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/CheckBox.qml')
-rw-r--r-- | src/imports/controls/CheckBox.qml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/controls/CheckBox.qml b/src/imports/controls/CheckBox.qml index 5eb7696e..5bfddbf3 100644 --- a/src/imports/controls/CheckBox.qml +++ b/src/imports/controls/CheckBox.qml @@ -51,6 +51,7 @@ T.CheckBox { padding: 6 spacing: 6 + opacity: enabled ? 1 : 0.2 //! [indicator] indicator: Rectangle { @@ -59,15 +60,14 @@ T.CheckBox { x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 - color: control.pressed ? "#bdbebf" : "#ffffff" - border.color: control.pressed ? "#26282a" : (control.checked ? "#353637" : "#bdbebf") + color: control.enabled ? (control.pressed ? "#bdbebf" : "#ffffff") : "#353637" + border.color: control.enabled ? (control.pressed ? "#26282a" : "#353637") : "transparent" Image { x: (parent.width - width) / 2 y: (parent.height - height) / 2 source: "qrc:/images/check.png" visible: control.checked -// opacity: control.tristate && control.checkState === Qt.PartiallyChecked ? 0.5 : 1.0 } } //! [indicator] @@ -81,7 +81,7 @@ T.CheckBox { text: control.text font: control.font - color: control.enabled ? "#26282a" : "#bdbebf" + color: control.pressed ? "#26282a" : "#353637" elide: Text.ElideRight visible: control.text horizontalAlignment: Text.AlignLeft |