diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-14 01:00:27 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-04-14 15:09:05 +0000 |
| commit | 28ab81f2c02378735ff82a6e130f0d38d6471069 (patch) | |
| tree | ce6df68f10c222929054f8f8916c669ab7e362cc /src/imports/controls/material | |
| parent | 704625a034270739e886a28bfa6e8889c8ad984b (diff) | |
| parent | 625a7d1a5cb0b808a734ee7ea1e268c409417349 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev
Diffstat (limited to 'src/imports/controls/material')
| -rw-r--r-- | src/imports/controls/material/CheckIndicator.qml | 5 | ||||
| -rw-r--r-- | src/imports/controls/material/RadioIndicator.qml | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/imports/controls/material/CheckIndicator.qml b/src/imports/controls/material/CheckIndicator.qml index bfeda537..c52d5ae0 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 diff --git a/src/imports/controls/material/RadioIndicator.qml b/src/imports/controls/material/RadioIndicator.qml index 0ed632a6..f69f31cc 100644 --- a/src/imports/controls/material/RadioIndicator.qml +++ b/src/imports/controls/material/RadioIndicator.qml @@ -43,7 +43,8 @@ Rectangle { implicitHeight: 20 radius: width / 2 border.width: 2 - border.color: control.checked || control.down ? control.Material.accentColor : control.Material.secondaryTextColor + border.color: !control.enabled ? control.Material.hintTextColor + : control.checked || control.down ? control.Material.accentColor : control.Material.secondaryTextColor color: "transparent" property Item control |