diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-11-17 18:35:24 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-11-17 18:35:24 +0100 |
| commit | 4f2bb3e5a1ecbb1728209c7b2525c2c645ef49a2 (patch) | |
| tree | f3be806d0301078e69d3043c2ac1d370aca14825 /src/imports/controls/material/Tumbler.qml | |
| parent | 170869fe1457fc68e96d46c9ff804071f86bd029 (diff) | |
| parent | 4ef7af98e69bf676dd39e6aad5e6a5f980648e75 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/quickcontrols2/qquickstyle.cpp
src/quicktemplates2/qquickslider.cpp
Change-Id: Ie12132690680706def6f516334a6ef0ba27336b3
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 06a012f6..b8d0e975 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 |