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/Tumbler.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/Tumbler.qml')
| -rw-r--r-- | src/imports/controls/Tumbler.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/controls/Tumbler.qml b/src/imports/controls/Tumbler.qml index 04c4b535..622a6098 100644 --- a/src/imports/controls/Tumbler.qml +++ b/src/imports/controls/Tumbler.qml @@ -47,9 +47,9 @@ T.Tumbler { delegate: Text { id: label text: modelData - color: control.visualFocus ? Default.focusColor : Default.textDarkColor + color: control.visualFocus ? Default.focusColor : control.palette.text font: control.font - opacity: (1.0 - Math.abs(Tumbler.displacement) / (visibleItemCount / 2)) * (control.enabled ? 1 : 0.6) + opacity: 1.0 - Math.abs(Tumbler.displacement) / (visibleItemCount / 2) horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter } |