From fe3b3c707e2bc41f2e98d315ba72f50d4929e064 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Tue, 3 Mar 2020 10:48:27 +0100 Subject: HeaderView: Add support for list based models Change-Id: I411136bd2b9a277d84a7c68c55bb1c317b6cc9d2 Reviewed-by: Mitch Curtis --- src/imports/controls/HorizontalHeaderView.qml | 4 +++- src/imports/controls/VerticalHeaderView.qml | 4 +++- src/imports/controls/fusion/HorizontalHeaderView.qml | 4 +++- src/imports/controls/fusion/VerticalHeaderView.qml | 4 +++- src/imports/controls/imagine/HorizontalHeaderView.qml | 4 +++- src/imports/controls/imagine/VerticalHeaderView.qml | 4 +++- src/imports/controls/material/HorizontalHeaderView.qml | 4 +++- src/imports/controls/material/VerticalHeaderView.qml | 4 +++- src/imports/controls/universal/HorizontalHeaderView.qml | 4 +++- src/imports/controls/universal/VerticalHeaderView.qml | 4 +++- 10 files changed, 30 insertions(+), 10 deletions(-) (limited to 'src/imports/controls') diff --git a/src/imports/controls/HorizontalHeaderView.qml b/src/imports/controls/HorizontalHeaderView.qml index 7f0454da..ec91af25 100644 --- a/src/imports/controls/HorizontalHeaderView.qml +++ b/src/imports/controls/HorizontalHeaderView.qml @@ -55,7 +55,9 @@ T.HorizontalHeaderView { Text { id: text - text: model[control.textRole] + text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] + : model[control.textRole]) + : modelData width: parent.width height: parent.height horizontalAlignment: Text.AlignHCenter diff --git a/src/imports/controls/VerticalHeaderView.qml b/src/imports/controls/VerticalHeaderView.qml index 5fbfaedf..3fc9ca5a 100644 --- a/src/imports/controls/VerticalHeaderView.qml +++ b/src/imports/controls/VerticalHeaderView.qml @@ -55,7 +55,9 @@ T.VerticalHeaderView { Text { id: text - text: model[control.textRole] + text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] + : model[control.textRole]) + : modelData width: parent.width height: parent.height horizontalAlignment: Text.AlignHCenter diff --git a/src/imports/controls/fusion/HorizontalHeaderView.qml b/src/imports/controls/fusion/HorizontalHeaderView.qml index 3d0f247b..bbd9dc3f 100644 --- a/src/imports/controls/fusion/HorizontalHeaderView.qml +++ b/src/imports/controls/fusion/HorizontalHeaderView.qml @@ -65,7 +65,9 @@ T.HorizontalHeaderView { Text { id: text - text: model[control.textRole] + text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] + : model[control.textRole]) + : modelData width: parent.width height: parent.height horizontalAlignment: Text.AlignHCenter diff --git a/src/imports/controls/fusion/VerticalHeaderView.qml b/src/imports/controls/fusion/VerticalHeaderView.qml index 5ad0db8f..b220cdf2 100644 --- a/src/imports/controls/fusion/VerticalHeaderView.qml +++ b/src/imports/controls/fusion/VerticalHeaderView.qml @@ -65,7 +65,9 @@ T.VerticalHeaderView { Text { id: text - text: model[control.textRole] + text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] + : model[control.textRole]) + : modelData width: parent.width height: parent.height horizontalAlignment: Text.AlignHCenter diff --git a/src/imports/controls/imagine/HorizontalHeaderView.qml b/src/imports/controls/imagine/HorizontalHeaderView.qml index 7f0454da..ec91af25 100644 --- a/src/imports/controls/imagine/HorizontalHeaderView.qml +++ b/src/imports/controls/imagine/HorizontalHeaderView.qml @@ -55,7 +55,9 @@ T.HorizontalHeaderView { Text { id: text - text: model[control.textRole] + text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] + : model[control.textRole]) + : modelData width: parent.width height: parent.height horizontalAlignment: Text.AlignHCenter diff --git a/src/imports/controls/imagine/VerticalHeaderView.qml b/src/imports/controls/imagine/VerticalHeaderView.qml index 5fbfaedf..3fc9ca5a 100644 --- a/src/imports/controls/imagine/VerticalHeaderView.qml +++ b/src/imports/controls/imagine/VerticalHeaderView.qml @@ -55,7 +55,9 @@ T.VerticalHeaderView { Text { id: text - text: model[control.textRole] + text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] + : model[control.textRole]) + : modelData width: parent.width height: parent.height horizontalAlignment: Text.AlignHCenter diff --git a/src/imports/controls/material/HorizontalHeaderView.qml b/src/imports/controls/material/HorizontalHeaderView.qml index 504579cc..fd672f34 100644 --- a/src/imports/controls/material/HorizontalHeaderView.qml +++ b/src/imports/controls/material/HorizontalHeaderView.qml @@ -56,7 +56,9 @@ T.HorizontalHeaderView { Text { id: text - text: model[control.textRole] + text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] + : model[control.textRole]) + : modelData width: parent.width height: parent.height horizontalAlignment: Text.AlignHCenter diff --git a/src/imports/controls/material/VerticalHeaderView.qml b/src/imports/controls/material/VerticalHeaderView.qml index 7f8ecc92..5fc5aebe 100644 --- a/src/imports/controls/material/VerticalHeaderView.qml +++ b/src/imports/controls/material/VerticalHeaderView.qml @@ -56,7 +56,9 @@ T.VerticalHeaderView { Text { id: text - text: model[control.textRole] + text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] + : model[control.textRole]) + : modelData width: parent.width height: parent.height horizontalAlignment: Text.AlignHCenter diff --git a/src/imports/controls/universal/HorizontalHeaderView.qml b/src/imports/controls/universal/HorizontalHeaderView.qml index 8cdfda35..47daa8ce 100644 --- a/src/imports/controls/universal/HorizontalHeaderView.qml +++ b/src/imports/controls/universal/HorizontalHeaderView.qml @@ -57,7 +57,9 @@ T.HorizontalHeaderView { Text { id: text - text: model[control.textRole] + text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] + : model[control.textRole]) + : modelData width: parent.width height: parent.height horizontalAlignment: Text.AlignHCenter diff --git a/src/imports/controls/universal/VerticalHeaderView.qml b/src/imports/controls/universal/VerticalHeaderView.qml index 7c7544af..04408d68 100644 --- a/src/imports/controls/universal/VerticalHeaderView.qml +++ b/src/imports/controls/universal/VerticalHeaderView.qml @@ -57,7 +57,9 @@ T.VerticalHeaderView { Text { id: text - text: model[control.textRole] + text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] + : model[control.textRole]) + : modelData width: parent.width height: parent.height horizontalAlignment: Text.AlignHCenter -- cgit v1.2.3