diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-09-21 10:11:04 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-09-22 11:20:27 +0000 |
| commit | 188b5e2a02926b6f1b43793f0bc1f6435bb949c4 (patch) | |
| tree | 35d358ba9b0757f3065963af5cc9b60c31da0b1f /src/imports/controls/SwitchDelegate.qml | |
| parent | 72d9c1bfb7f814163880386584cc6edde9158713 (diff) | |
Default: use palette.text
Make editors and delegates use the "text" color role from palettes.
This color role is normally used as a foreground color for the "base"
background color.
Task-number: QTBUG-63331
Change-Id: Ic08463f54c1b04a4eccf791a576ae792f75bf89b
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/SwitchDelegate.qml')
| -rw-r--r-- | src/imports/controls/SwitchDelegate.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/controls/SwitchDelegate.qml b/src/imports/controls/SwitchDelegate.qml index e4cc962e..0605a4cc 100644 --- a/src/imports/controls/SwitchDelegate.qml +++ b/src/imports/controls/SwitchDelegate.qml @@ -54,7 +54,7 @@ T.SwitchDelegate { icon.width: 24 icon.height: 24 - icon.color: enabled ? Default.textDarkColor : Default.textDisabledColor + icon.color: control.palette.text indicator: SwitchIndicator { x: text ? (control.mirrored ? control.leftPadding : control.width - width - control.rightPadding) : control.leftPadding + (control.availableWidth - width) / 2 @@ -74,7 +74,7 @@ T.SwitchDelegate { icon: control.icon text: control.text font: control.font - color: control.enabled ? Default.textDarkColor : Default.textDisabledColor + color: control.palette.text } background: Rectangle { |