diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2017-05-02 14:06:57 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2017-05-02 16:46:26 +0000 |
| commit | d5e2b44a98fd249dd6a751564a9ea8675ca43c8f (patch) | |
| tree | 4638d3e97daf33cc7f95750a3db696932bd723c5 /src/imports/controls/universal | |
| parent | 209c85709eff639651c5ead3bc7696dfd8b907f0 (diff) | |
Universal: make icon color match text color
Task-number: QTBUG-60502
Change-Id: Ib5824c50aacddd6d0fefadfe7efb4836bb1b9925
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/imports/controls/universal')
| -rw-r--r-- | src/imports/controls/universal/Button.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/universal/CheckDelegate.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/universal/ItemDelegate.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/universal/MenuItem.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/universal/RadioDelegate.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/universal/RoundButton.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/universal/SwitchDelegate.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/universal/ToolButton.qml | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/src/imports/controls/universal/Button.qml b/src/imports/controls/universal/Button.qml index 44f86a38..27d8aa78 100644 --- a/src/imports/controls/universal/Button.qml +++ b/src/imports/controls/universal/Button.qml @@ -56,7 +56,7 @@ T.Button { icon.width: 20 icon.height: 20 - icon.color: enabled ? undefined : Color.transparent(Universal.foreground, 0.2) + icon.color: Color.transparent(Universal.foreground, enabled ? 1.0 : 0.2) property bool useSystemFocusVisuals: true diff --git a/src/imports/controls/universal/CheckDelegate.qml b/src/imports/controls/universal/CheckDelegate.qml index 5d866d06..f35542d0 100644 --- a/src/imports/controls/universal/CheckDelegate.qml +++ b/src/imports/controls/universal/CheckDelegate.qml @@ -58,7 +58,7 @@ T.CheckDelegate { icon.width: 20 icon.height: 20 - icon.color: enabled ? undefined : Color.transparent(Universal.foreground, 0.2) + icon.color: Color.transparent(Universal.foreground, enabled ? 1.0 : 0.2) 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/universal/ItemDelegate.qml b/src/imports/controls/universal/ItemDelegate.qml index 0ccac5b9..5c4c3ba9 100644 --- a/src/imports/controls/universal/ItemDelegate.qml +++ b/src/imports/controls/universal/ItemDelegate.qml @@ -58,7 +58,7 @@ T.ItemDelegate { icon.width: 20 icon.height: 20 - icon.color: enabled ? undefined : Color.transparent(Universal.foreground, 0.2) + icon.color: Color.transparent(Universal.foreground, enabled ? 1.0 : 0.2) contentItem: IconLabel { spacing: control.spacing diff --git a/src/imports/controls/universal/MenuItem.qml b/src/imports/controls/universal/MenuItem.qml index 35def542..ac3c4e98 100644 --- a/src/imports/controls/universal/MenuItem.qml +++ b/src/imports/controls/universal/MenuItem.qml @@ -57,7 +57,7 @@ T.MenuItem { icon.width: 20 icon.height: 20 - icon.color: enabled ? undefined : Color.transparent(Universal.foreground, 0.2) + icon.color: !enabled ? Universal.baseLowColor : Universal.baseHighColor contentItem: IconLabel { leftPadding: control.checkable && !control.mirrored ? control.indicator.width + control.spacing : 0 diff --git a/src/imports/controls/universal/RadioDelegate.qml b/src/imports/controls/universal/RadioDelegate.qml index bc15f990..32c1aaec 100644 --- a/src/imports/controls/universal/RadioDelegate.qml +++ b/src/imports/controls/universal/RadioDelegate.qml @@ -58,7 +58,7 @@ T.RadioDelegate { icon.width: 20 icon.height: 20 - icon.color: enabled ? undefined : Color.transparent(Universal.foreground, 0.2) + icon.color: Color.transparent(Universal.foreground, enabled ? 1.0 : 0.2) 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/universal/RoundButton.qml b/src/imports/controls/universal/RoundButton.qml index 759f5113..ac5f2545 100644 --- a/src/imports/controls/universal/RoundButton.qml +++ b/src/imports/controls/universal/RoundButton.qml @@ -54,7 +54,7 @@ T.RoundButton { icon.width: 20 icon.height: 20 - icon.color: enabled ? undefined : Color.transparent(Universal.foreground, 0.2) + icon.color: Color.transparent(Universal.foreground, enabled ? 1.0 : 0.2) property bool useSystemFocusVisuals: true diff --git a/src/imports/controls/universal/SwitchDelegate.qml b/src/imports/controls/universal/SwitchDelegate.qml index af7f403e..c97d21a0 100644 --- a/src/imports/controls/universal/SwitchDelegate.qml +++ b/src/imports/controls/universal/SwitchDelegate.qml @@ -58,7 +58,7 @@ T.SwitchDelegate { icon.width: 20 icon.height: 20 - icon.color: enabled ? undefined : Color.transparent(Universal.foreground, 0.2) + icon.color: Color.transparent(Universal.foreground, enabled ? 1.0 : 0.2) 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/universal/ToolButton.qml b/src/imports/controls/universal/ToolButton.qml index a13181a2..cd0b2ca9 100644 --- a/src/imports/controls/universal/ToolButton.qml +++ b/src/imports/controls/universal/ToolButton.qml @@ -54,7 +54,7 @@ T.ToolButton { icon.width: 20 icon.height: 20 - icon.color: enabled ? undefined : Color.transparent(Universal.foreground, 0.2) + icon.color: Color.transparent(Universal.foreground, enabled ? 1.0 : 0.2) property bool useSystemFocusVisuals: true |