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 | |
| 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')
| -rw-r--r-- | src/imports/controls/material/Button.qml | 4 | ||||
| -rw-r--r-- | src/imports/controls/material/CheckDelegate.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/material/ItemDelegate.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/material/MenuItem.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/material/RadioDelegate.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/material/RoundButton.qml | 4 | ||||
| -rw-r--r-- | src/imports/controls/material/SwitchDelegate.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/material/ToolButton.qml | 2 |
8 files changed, 12 insertions, 8 deletions
diff --git a/src/imports/controls/material/Button.qml b/src/imports/controls/material/Button.qml index 9e21c8a0..7d5ff57d 100644 --- a/src/imports/controls/material/Button.qml +++ b/src/imports/controls/material/Button.qml @@ -58,7 +58,9 @@ T.Button { 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 ? 8 : 2 diff --git a/src/imports/controls/material/CheckDelegate.qml b/src/imports/controls/material/CheckDelegate.qml index 431fcb16..5e6aabef 100644 --- a/src/imports/controls/material/CheckDelegate.qml +++ b/src/imports/controls/material/CheckDelegate.qml @@ -58,7 +58,7 @@ T.CheckDelegate { icon.width: 24 icon.height: 24 - icon.color: enabled ? undefined : Material.hintTextColor + icon.color: enabled ? Material.foreground : Material.hintTextColor indicator: CheckIndicator { x: text ? (control.mirrored ? control.leftPadding : control.width - width - control.rightPadding) : control.leftPadding + (control.availableWidth - width) / 2 diff --git a/src/imports/controls/material/ItemDelegate.qml b/src/imports/controls/material/ItemDelegate.qml index e9a75186..09471fae 100644 --- a/src/imports/controls/material/ItemDelegate.qml +++ b/src/imports/controls/material/ItemDelegate.qml @@ -56,7 +56,7 @@ T.ItemDelegate { icon.width: 24 icon.height: 24 - icon.color: enabled ? undefined : Material.hintTextColor + icon.color: enabled ? Material.foreground : Material.hintTextColor contentItem: IconLabel { spacing: control.spacing diff --git a/src/imports/controls/material/MenuItem.qml b/src/imports/controls/material/MenuItem.qml index 7c4e93fe..b91718b6 100644 --- a/src/imports/controls/material/MenuItem.qml +++ b/src/imports/controls/material/MenuItem.qml @@ -58,7 +58,7 @@ T.MenuItem { icon.width: 24 icon.height: 24 - icon.color: enabled ? undefined : Material.hintTextColor + icon.color: enabled ? Material.foreground : Material.hintTextColor indicator: CheckIndicator { x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 diff --git a/src/imports/controls/material/RadioDelegate.qml b/src/imports/controls/material/RadioDelegate.qml index 18a2de35..7b163ea8 100644 --- a/src/imports/controls/material/RadioDelegate.qml +++ b/src/imports/controls/material/RadioDelegate.qml @@ -58,7 +58,7 @@ T.RadioDelegate { icon.width: 24 icon.height: 24 - icon.color: enabled ? undefined : Material.hintTextColor + icon.color: enabled ? Material.foreground : Material.hintTextColor indicator: RadioIndicator { x: text ? (control.mirrored ? control.leftPadding : control.width - width - control.rightPadding) : control.leftPadding + (control.availableWidth - width) / 2 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 diff --git a/src/imports/controls/material/SwitchDelegate.qml b/src/imports/controls/material/SwitchDelegate.qml index c1591178..f96a67ac 100644 --- a/src/imports/controls/material/SwitchDelegate.qml +++ b/src/imports/controls/material/SwitchDelegate.qml @@ -58,7 +58,7 @@ T.SwitchDelegate { icon.width: 24 icon.height: 24 - icon.color: enabled ? undefined : Material.hintTextColor + icon.color: enabled ? Material.foreground : Material.hintTextColor indicator: SwitchIndicator { x: text ? (control.mirrored ? control.leftPadding : control.width - width - control.rightPadding) : control.leftPadding + (control.availableWidth - width) / 2 diff --git a/src/imports/controls/material/ToolButton.qml b/src/imports/controls/material/ToolButton.qml index c794a468..158aea1b 100644 --- a/src/imports/controls/material/ToolButton.qml +++ b/src/imports/controls/material/ToolButton.qml @@ -55,7 +55,7 @@ T.ToolButton { icon.width: 24 icon.height: 24 - icon.color: enabled ? undefined : Material.hintTextColor + icon.color: !enabled ? Material.hintTextColor : checked || highlighted ? Material.accent : Material.foreground contentItem: IconLabel { spacing: control.spacing |