diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2017-05-02 13:32:20 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2017-05-02 16:46:15 +0000 |
| commit | 209c85709eff639651c5ead3bc7696dfd8b907f0 (patch) | |
| tree | ed9e3de8d55944e5f51e3a8985e57f2d3f8345b8 /src/imports/controls/material/RoundButton.qml | |
| parent | 157b0033e5efced636d441d68ef8d1d149347c38 (diff) | |
Material: make icon color match text color
Task-number: QTBUG-60502
Change-Id: Ia861155b0728cf5f8d1815dc2ff2af94a68b6b8f
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/imports/controls/material/RoundButton.qml')
| -rw-r--r-- | src/imports/controls/material/RoundButton.qml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/imports/controls/material/RoundButton.qml b/src/imports/controls/material/RoundButton.qml index ac5949d9..f36ef614 100644 --- a/src/imports/controls/material/RoundButton.qml +++ b/src/imports/controls/material/RoundButton.qml @@ -56,7 +56,9 @@ T.RoundButton { icon.width: 24 icon.height: 24 - icon.color: enabled ? undefined : Material.hintTextColor + icon.color: !enabled ? Material.hintTextColor : + flat && highlighted ? Material.accentColor : + highlighted ? Material.primaryHighlightedTextColor : Material.foreground Material.elevation: flat ? control.down || control.hovered ? 2 : 0 : control.down ? 12 : 6 |