From 418cb72b9346ddb258cb1384fd6b95af143c2059 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Tue, 17 Mar 2020 20:19:41 +0100 Subject: Account for the padding around a menu when checking if it is interactive If there is padding around the menu then it will mean the available height is smaller than the containing item and as such should be interactive. Fixes: QTBUG-82473 Change-Id: Ie3e7568ab66aa3da93e5448c1a27c9bd2a5e486a Reviewed-by: Mitch Curtis --- src/imports/controls/imagine/Menu.qml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/imports/controls/imagine') diff --git a/src/imports/controls/imagine/Menu.qml b/src/imports/controls/imagine/Menu.qml index 20a34467..832565e6 100644 --- a/src/imports/controls/imagine/Menu.qml +++ b/src/imports/controls/imagine/Menu.qml @@ -69,7 +69,9 @@ T.Menu { contentItem: ListView { implicitHeight: contentHeight model: control.contentModel - interactive: Window.window ? contentHeight > Window.window.height : false + interactive: Window.window + ? contentHeight + control.topPadding + control.bottomPadding > Window.window.height + : false clip: true currentIndex: control.currentIndex -- cgit v1.2.3 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/imagine/HorizontalHeaderView.qml | 4 +++- src/imports/controls/imagine/VerticalHeaderView.qml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src/imports/controls/imagine') 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 -- cgit v1.2.3