From c67c468ec13a134c5ad7fe36bf69f12a3498a01b Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Thu, 20 Jan 2022 15:51:00 +0100 Subject: QQuickTreeView: be able to expand rows that are not yet visible in the view If the app expands a row in TreeView, that row will for a brief moment be expanded in the proxy model, but not in the view, until the view is polished. For that reason, when determining if a row can be expanded or not, we should check the state of the proxy model, and not the view. Note: if the application needs the state of the view to reflect the state of the proxy model immediataly after a call to expand, forcePolish() is always possible. Task-number: QTBUG-91374 Change-Id: Ibda8d90e2dc2077a6f24090566ce3ba20a734c29 Reviewed-by: Shawn Rutledge --- tests/auto/tst_treeview.cpp | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'tests/auto/tst_treeview.cpp') diff --git a/tests/auto/tst_treeview.cpp b/tests/auto/tst_treeview.cpp index 413b2b3..b8f1713 100644 --- a/tests/auto/tst_treeview.cpp +++ b/tests/auto/tst_treeview.cpp @@ -74,6 +74,7 @@ private slots: void showTreeView(); void expandAndCollapseRoot(); void expandAndCollapseChildren(); + void expandChildPendingToBeVisible(); void attachedPropertiesRoot(); void attachedPropertiesChildren(); void emptyModel(); @@ -167,6 +168,28 @@ void tst_treeview::expandAndCollapseChildren() QCOMPARE(treeView->rows(), 1); } +void tst_treeview::expandChildPendingToBeVisible() +{ + // Check that if we expand a row r1, and that row has a child r2 that can + // be expanded, we can continue to expand c2 immediately, even if r1 is + // still pending to be shown as expanded in the view. + LOAD_TREEVIEW("normaltreeview.qml"); + QMetaObject::invokeMethod(treeView, "expand", Q_ARG(int, 0)); + // The view has not yet been updated at this point to show + // the newly expanded children, so it still has only one row. + QCOMPARE(treeView->rows(), 1); + // ...but we still expand row 5, which is a child that has children + // in the proxy model + QMetaObject::invokeMethod(treeView, "expand", Q_ARG(int, 4)); + QCOMPARE(treeView->rows(), 1); + + WAIT_UNTIL_POLISHED; + + // Now the view have updated to show + // all the rows that has been expanded. + QCOMPARE(treeView->rows(), 9); +} + void tst_treeview::attachedPropertiesRoot() { LOAD_TREEVIEW("normaltreeview.qml"); -- cgit v1.2.3