diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-11-16 13:28:17 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-11-16 14:50:19 +0000 |
| commit | 3ea7f91d9bb0e74f1c49384019f22d55b2fb6263 (patch) | |
| tree | 7bc4be92765a8fe85db33e902a5aa912293183dc /src/imports/controls/material/Tumbler.qml | |
| parent | c69c1f32b0b42adb670c08653282a86cc411b239 (diff) | |
Material: de-couple foreground and primaryTextColor
In order to get the ComboBox colors right, it must be possible to query
the original primary text color value. It was very convenient to make
Material.primaryTextColor return custom Material.foreground colors,
because that way we didn't have to touch our QML files, but this
approach is no longer usable.
Task-number: QTBUG-57167
Change-Id: Iee003e96112b919dc7c84a906e4f5691b0f2a6ab
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/material/Tumbler.qml')
| -rw-r--r-- | src/imports/controls/material/Tumbler.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/controls/material/Tumbler.qml b/src/imports/controls/material/Tumbler.qml index 88750855..a3be17b7 100644 --- a/src/imports/controls/material/Tumbler.qml +++ b/src/imports/controls/material/Tumbler.qml @@ -48,7 +48,7 @@ T.Tumbler { delegate: Text { id: label text: modelData - color: control.Material.primaryTextColor + color: control.Material.foreground font: control.font opacity: (1.0 - Math.abs(Tumbler.displacement) / (visibleItemCount / 2)) * (control.enabled ? 1 : 0.6) horizontalAlignment: Text.AlignHCenter |