aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2018-04-10 11:50:32 +0200
committerMitch Curtis <mitch.curtis@qt.io>2018-04-10 14:34:16 +0000
commit99b2fbbc90466c79837c7e68ac5d7a15b2f91699 (patch)
treec9f67e7eec4ec065eeec81a51a2190d94b0e5045
parentcfe00c40127dbe5790e04cd9f810bcc98fee13ed (diff)
Material: fix CheckIndicator disabled state
Task-number: QTBUG-67573 Change-Id: Iecdc9f6f35f858b962dc9a9e17077a35f56e90dd Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
-rw-r--r--src/imports/controls/material/CheckIndicator.qml5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/imports/controls/material/CheckIndicator.qml b/src/imports/controls/material/CheckIndicator.qml
index 078b1637..71962150 100644
--- a/src/imports/controls/material/CheckIndicator.qml
+++ b/src/imports/controls/material/CheckIndicator.qml
@@ -43,8 +43,9 @@ Rectangle {
implicitWidth: 18
implicitHeight: 18
color: "transparent"
- border.color: control.checked && control.enabled ? control.Material.accentColor : control.Material.secondaryTextColor
- border.width: control.checked ? width / 2 : 2
+ border.color: !control.enabled ? control.Material.hintTextColor
+ : control.checkState !== Qt.Unchecked ? control.Material.accentColor : control.Material.secondaryTextColor
+ border.width: control.checkState !== Qt.Unchecked ? width / 2 : 2
radius: 2
property Item control