diff options
| author | Richard Moe Gustavsen <richard.gustavsen@qt.io> | 2023-01-11 13:35:22 +0100 |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@qt.io> | 2023-01-17 21:27:51 +0100 |
| commit | 4b70d330b0c7ee81352c8f3d4723d08a3fbeb382 (patch) | |
| tree | 4494eedfff67342350a471eb8200084f2456fa28 | |
| parent | 75abcdc374b5ff24ee0653a1377b019c001a9628 (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).
Change-Id: I9b10a7b9ac74e6f67f0644f3a2376f13e3da2c8d
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit 55da2e6c994c8f6f0e49e501e4a5ff275f4a9d15)
10 files changed, 10 insertions, 10 deletions
diff --git a/src/quickcontrols2/basic/HorizontalHeaderView.qml b/src/quickcontrols2/basic/HorizontalHeaderView.qml index 140c9f3ae8..bad08d947d 100644 --- a/src/quickcontrols2/basic/HorizontalHeaderView.qml +++ b/src/quickcontrols2/basic/HorizontalHeaderView.qml @@ -19,7 +19,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/quickcontrols2/basic/VerticalHeaderView.qml b/src/quickcontrols2/basic/VerticalHeaderView.qml index a59e228d20..cb942c978f 100644 --- a/src/quickcontrols2/basic/VerticalHeaderView.qml +++ b/src/quickcontrols2/basic/VerticalHeaderView.qml @@ -19,7 +19,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/quickcontrols2/fusion/HorizontalHeaderView.qml b/src/quickcontrols2/fusion/HorizontalHeaderView.qml index aafe0fb2fd..df868644f3 100644 --- a/src/quickcontrols2/fusion/HorizontalHeaderView.qml +++ b/src/quickcontrols2/fusion/HorizontalHeaderView.qml @@ -29,7 +29,7 @@ T.HorizontalHeaderView { } } - Text { + Label { id: text text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) diff --git a/src/quickcontrols2/fusion/VerticalHeaderView.qml b/src/quickcontrols2/fusion/VerticalHeaderView.qml index 7ae2fcdd62..9cd3e57c45 100644 --- a/src/quickcontrols2/fusion/VerticalHeaderView.qml +++ b/src/quickcontrols2/fusion/VerticalHeaderView.qml @@ -29,7 +29,7 @@ T.VerticalHeaderView { } } - Text { + Label { id: text text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) diff --git a/src/quickcontrols2/imagine/HorizontalHeaderView.qml b/src/quickcontrols2/imagine/HorizontalHeaderView.qml index 140c9f3ae8..bad08d947d 100644 --- a/src/quickcontrols2/imagine/HorizontalHeaderView.qml +++ b/src/quickcontrols2/imagine/HorizontalHeaderView.qml @@ -19,7 +19,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/quickcontrols2/imagine/VerticalHeaderView.qml b/src/quickcontrols2/imagine/VerticalHeaderView.qml index a59e228d20..cb942c978f 100644 --- a/src/quickcontrols2/imagine/VerticalHeaderView.qml +++ b/src/quickcontrols2/imagine/VerticalHeaderView.qml @@ -19,7 +19,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/quickcontrols2/material/HorizontalHeaderView.qml b/src/quickcontrols2/material/HorizontalHeaderView.qml index 671728c004..430508cbdc 100644 --- a/src/quickcontrols2/material/HorizontalHeaderView.qml +++ b/src/quickcontrols2/material/HorizontalHeaderView.qml @@ -20,7 +20,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/quickcontrols2/material/VerticalHeaderView.qml b/src/quickcontrols2/material/VerticalHeaderView.qml index e497d4a84c..322df3e593 100644 --- a/src/quickcontrols2/material/VerticalHeaderView.qml +++ b/src/quickcontrols2/material/VerticalHeaderView.qml @@ -20,7 +20,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/quickcontrols2/universal/HorizontalHeaderView.qml b/src/quickcontrols2/universal/HorizontalHeaderView.qml index 878fb1e10e..f1112bb8f8 100644 --- a/src/quickcontrols2/universal/HorizontalHeaderView.qml +++ b/src/quickcontrols2/universal/HorizontalHeaderView.qml @@ -21,7 +21,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/quickcontrols2/universal/VerticalHeaderView.qml b/src/quickcontrols2/universal/VerticalHeaderView.qml index 189bed0906..c8fb52a58f 100644 --- a/src/quickcontrols2/universal/VerticalHeaderView.qml +++ b/src/quickcontrols2/universal/VerticalHeaderView.qml @@ -21,7 +21,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]) |