From 6bc4d55fe196a6310cadb239c6069ad2ea044d05 Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Wed, 4 Dec 2019 13:07:06 +0100 Subject: [PATCH] QQuickTableView: support assigning a DelegateModel Normally you either assign a model to TableView that already has a delegate (or don't need one), like DelegateModel or ObjectModel. Or instead you assign a QAIM model and a delegate directly. But if you assign both a delegate and an ObjectModel, TableView would be confused, and ignore the assigned model and instead create an internal wrapper model that ends up empty. This patch will ensure that we don't create a wrapper model in such cases, but instead forward the delegate to whichever model is assigned, even if it ends up as a no-op for models that don't use one. Task-number: QTBUG-80534 Change-Id: Idd220df08617c379dc7808ee1f41c862b78cc201 Reviewed-by: Ulf Hermann --- src/quick/items/qquicktableview.cpp | 18 +++++++++++------- .../data/replaceModelTableView.qml | 10 +++++----- .../qquicktableview/tst_qquicktableview.cpp | 4 ++-- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/quick/items/qquicktableview.cpp b/src/quick/items/qquicktableview.cpp index e7c6d51cbf..73857af558 100644 --- a/src/quick/items/qquicktableview.cpp +++ b/src/quick/items/qquicktableview.cpp @@ -1054,12 +1054,14 @@ void QQuickTableViewPrivate::releaseLoadedItems(QQmlTableInstanceModel::Reusable void QQuickTableViewPrivate::releaseItem(FxTableItem *fxTableItem, QQmlTableInstanceModel::ReusableFlag reusableFlag) { Q_Q(QQuickTableView); + // Note that fxTableItem->item might already have been destroyed, in case + // the item is owned by the QML context rather than the model (e.g ObjectModel etc). auto item = fxTableItem->item; - Q_TABLEVIEW_ASSERT(item, fxTableItem->index); if (fxTableItem->ownItem) { + Q_TABLEVIEW_ASSERT(item, fxTableItem->index); delete item; - } else { + } else if (item) { // Only QQmlTableInstanceModel supports reusing items auto releaseFlag = tableModel ? tableModel->release(item, reusableFlag) : @@ -2219,13 +2221,15 @@ void QQuickTableViewPrivate::syncRebuildOptions() void QQuickTableViewPrivate::syncDelegate() { - if (tableModel && assignedDelegate == tableModel->delegate()) + if (!tableModel) { + // Only the tableModel uses the delegate assigned to a + // TableView. DelegateModel has it's own delegate, and + // ObjectModel etc. doesn't use one. return; + } - if (!tableModel) - createWrapperModel(); - - tableModel->setDelegate(assignedDelegate); + if (assignedDelegate != tableModel->delegate()) + tableModel->setDelegate(assignedDelegate); } void QQuickTableViewPrivate::syncModel() diff --git a/tests/auto/quick/qquicktableview/data/replaceModelTableView.qml b/tests/auto/quick/qquicktableview/data/replaceModelTableView.qml index 2b17e055a7..1b6074f5d5 100644 --- a/tests/auto/quick/qquicktableview/data/replaceModelTableView.qml +++ b/tests/auto/quick/qquicktableview/data/replaceModelTableView.qml @@ -11,9 +11,9 @@ Item { ObjectModel { id: om - Rectangle { height: 30; width: 80; color: "red" } - Rectangle { height: 30; width: 80; color: "green" } - Rectangle { height: 30; width: 80; color: "blue" } + Rectangle { implicitHeight: 30; implicitWidth: 80; color: "red" } + Rectangle { implicitHeight: 30; implicitWidth: 80; color: "green" } + Rectangle { implicitHeight: 30; implicitWidth: 80; color: "blue" } } ListModel { @@ -29,8 +29,8 @@ Item { ListElement { name: "Orange" } } delegate: Rectangle { - height: 25 - width: 100 + implicitHeight: 25 + implicitWidth: 100 Text { text: "Name: " + name} } } diff --git a/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp b/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp index d6468f4652..09d1b8ca7c 100644 --- a/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp +++ b/tests/auto/quick/qquicktableview/tst_qquicktableview.cpp @@ -2708,9 +2708,9 @@ void tst_QQuickTableView::replaceModel() tableView->setProperty("modelId", 0); QTRY_COMPARE(tableView->rows(), 2); tableView->setProperty("modelId", 1); - QTRY_COMPARE(tableView->rows(), 0); + QTRY_COMPARE(tableView->rows(), 3); tableView->setProperty("modelId", 2); - QTRY_COMPARE(tableView->rows(), 0); + QTRY_COMPARE(tableView->rows(), 2); tableView->setProperty("modelId", 0); QTRY_COMPARE(tableView->rows(), 2); }