diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-31 03:03:15 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-31 03:03:15 +0200 |
| commit | 6d624d878ddedaf27bcd57c7ce1b66828d6d3b02 (patch) | |
| tree | ca5e5d812b99e51f752ee3a42be3cd135a75c731 /src/imports/controls/imagine | |
| parent | 5579140836afeb9274a4061dd309829d6b1b7610 (diff) | |
| parent | 25532ae18f25f2c415efc0f2ee9a67e16c39813b (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ie09cfdd17b00e56f3ba8677d25b24417dd4e42f6
Diffstat (limited to 'src/imports/controls/imagine')
| -rw-r--r-- | src/imports/controls/imagine/HorizontalHeaderView.qml | 4 | ||||
| -rw-r--r-- | src/imports/controls/imagine/Menu.qml | 4 | ||||
| -rw-r--r-- | src/imports/controls/imagine/VerticalHeaderView.qml | 4 |
3 files changed, 9 insertions, 3 deletions
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/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 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 |