diff options
author | Mitch Curtis <mitch.curtis@qt.io> | 2017-05-02 11:13:36 +0200 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@qt.io> | 2017-05-02 16:46:33 +0000 |
commit | 32977882a289d351fe99270d8b6adca49616fe39 (patch) | |
tree | dd31d31b717b8a07555397a437a6a1bc24fba5ce /src/imports/controls/Button.qml | |
parent | d5e2b44a98fd249dd6a751564a9ea8675ca43c8f (diff) |
Default: make icon color match text color
Task-number: QTBUG-60502
Change-Id: Id877eb72bfda6ca8877002b69ffdbb85ceb901fc
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/imports/controls/Button.qml')
-rw-r--r-- | src/imports/controls/Button.qml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml index 438265d1..b1670c9a 100644 --- a/src/imports/controls/Button.qml +++ b/src/imports/controls/Button.qml @@ -55,7 +55,9 @@ T.Button { icon.width: 24 icon.height: 24 - icon.color: enabled ? undefined : Default.textDisabledLightColor + icon.color: Color.transparent(checked || highlighted ? Default.textLightColor : + visualFocus ? Default.focusColor : down ? Default.textDarkColor : Default.textColor, + enabled || highlighted || checked ? 1 : 0.3) contentItem: IconLabel { spacing: control.spacing |