diff options
| author | Richard Moe Gustavsen <[email protected]> | 2023-01-11 13:35:22 +0100 |
|---|---|---|
| committer | Richard Moe Gustavsen <[email protected]> | 2023-01-13 09:37:35 +0100 |
| commit | 55da2e6c994c8f6f0e49e501e4a5ff275f4a9d15 (patch) | |
| tree | 8ff4d5ef3b7d3a4355d318e7c6a68bee454e7f41 /src/quickcontrols | |
| parent | b139070654501f8cbcd3a432abfcfdad72b36ca4 (diff) | |
HeaderView: Use Label instead of Text in the delegates
The Text item will not follow the application font.
So rather than using Text inside the delegates, use Label.
HeaderView doesn't currently have a font property that
can be set by the application, but using Label will at
least ensure that it ends up using the same font set on a
parent control (e.g ApplicationWindow, at the very least).
Pick-to: 6.5 6.4
Change-Id: I9b10a7b9ac74e6f67f0644f3a2376f13e3da2c8d
Reviewed-by: Mitch Curtis <[email protected]>
Diffstat (limited to 'src/quickcontrols')
10 files changed, 10 insertions, 10 deletions
diff --git a/src/quickcontrols/basic/HorizontalHeaderView.qml b/src/quickcontrols/basic/HorizontalHeaderView.qml index a46cf31f49..bbc8064a23 100644 --- a/src/quickcontrols/basic/HorizontalHeaderView.qml +++ b/src/quickcontrols/basic/HorizontalHeaderView.qml @@ -24,7 +24,7 @@ T.HorizontalHeaderView { color: "#f6f6f6" border.color: "#e4e4e4" - Text { + Label { id: text text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) diff --git a/src/quickcontrols/basic/VerticalHeaderView.qml b/src/quickcontrols/basic/VerticalHeaderView.qml index 5ff9043f93..23bb2d62e3 100644 --- a/src/quickcontrols/basic/VerticalHeaderView.qml +++ b/src/quickcontrols/basic/VerticalHeaderView.qml @@ -24,7 +24,7 @@ T.VerticalHeaderView { color: "#f6f6f6" border.color: "#e4e4e4" - Text { + Label { id: text text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) diff --git a/src/quickcontrols/fusion/HorizontalHeaderView.qml b/src/quickcontrols/fusion/HorizontalHeaderView.qml index 8a84c6142b..7e710b01a9 100644 --- a/src/quickcontrols/fusion/HorizontalHeaderView.qml +++ b/src/quickcontrols/fusion/HorizontalHeaderView.qml @@ -34,7 +34,7 @@ T.HorizontalHeaderView { } } - Text { + Label { id: text text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) diff --git a/src/quickcontrols/fusion/VerticalHeaderView.qml b/src/quickcontrols/fusion/VerticalHeaderView.qml index 2e9ef6d753..d41796849e 100644 --- a/src/quickcontrols/fusion/VerticalHeaderView.qml +++ b/src/quickcontrols/fusion/VerticalHeaderView.qml @@ -34,7 +34,7 @@ T.VerticalHeaderView { } } - Text { + Label { id: text text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) diff --git a/src/quickcontrols/imagine/HorizontalHeaderView.qml b/src/quickcontrols/imagine/HorizontalHeaderView.qml index a46cf31f49..bbc8064a23 100644 --- a/src/quickcontrols/imagine/HorizontalHeaderView.qml +++ b/src/quickcontrols/imagine/HorizontalHeaderView.qml @@ -24,7 +24,7 @@ T.HorizontalHeaderView { color: "#f6f6f6" border.color: "#e4e4e4" - Text { + Label { id: text text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) diff --git a/src/quickcontrols/imagine/VerticalHeaderView.qml b/src/quickcontrols/imagine/VerticalHeaderView.qml index 5ff9043f93..23bb2d62e3 100644 --- a/src/quickcontrols/imagine/VerticalHeaderView.qml +++ b/src/quickcontrols/imagine/VerticalHeaderView.qml @@ -24,7 +24,7 @@ T.VerticalHeaderView { color: "#f6f6f6" border.color: "#e4e4e4" - Text { + Label { id: text text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) diff --git a/src/quickcontrols/material/HorizontalHeaderView.qml b/src/quickcontrols/material/HorizontalHeaderView.qml index a90c4f0d75..0a5fe4f9f5 100644 --- a/src/quickcontrols/material/HorizontalHeaderView.qml +++ b/src/quickcontrols/material/HorizontalHeaderView.qml @@ -25,7 +25,7 @@ T.HorizontalHeaderView { implicitHeight: Math.max(control.height, text.implicitHeight + (cellPadding * 2)) color: control.Material.backgroundColor - Text { + Label { id: text text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) diff --git a/src/quickcontrols/material/VerticalHeaderView.qml b/src/quickcontrols/material/VerticalHeaderView.qml index f7b7ce9b5e..6b4d9e658b 100644 --- a/src/quickcontrols/material/VerticalHeaderView.qml +++ b/src/quickcontrols/material/VerticalHeaderView.qml @@ -25,7 +25,7 @@ T.VerticalHeaderView { implicitHeight: text.implicitHeight + (cellPadding * 2) color: control.Material.backgroundColor - Text { + Label { id: text text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) diff --git a/src/quickcontrols/universal/HorizontalHeaderView.qml b/src/quickcontrols/universal/HorizontalHeaderView.qml index 3700008e92..c72af49c57 100644 --- a/src/quickcontrols/universal/HorizontalHeaderView.qml +++ b/src/quickcontrols/universal/HorizontalHeaderView.qml @@ -26,7 +26,7 @@ T.HorizontalHeaderView { implicitHeight: Math.max(control.height, text.implicitHeight + (cellPadding * 2)) color: control.Universal.background - Text { + Label { id: text text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) diff --git a/src/quickcontrols/universal/VerticalHeaderView.qml b/src/quickcontrols/universal/VerticalHeaderView.qml index 43f8e6aeb8..c7223be355 100644 --- a/src/quickcontrols/universal/VerticalHeaderView.qml +++ b/src/quickcontrols/universal/VerticalHeaderView.qml @@ -26,7 +26,7 @@ T.VerticalHeaderView { implicitHeight: text.implicitHeight + (cellPadding * 2) color: control.Universal.background - Text { + Label { id: text text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) |