qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

QQuickTreeViewDelegate: toggle expanded on press 

When TreeView is interactive, it should expand
tree nodes on mouse release (to not interfere with flicking).
Otherwise, if interactive is false, it should expand already
on mouse press (equal to how e.g Widgets work).

The current if-test that implemented this logic was
broken, and would fail when TreeView was not interactive.

Change-Id: I801a694b2dfd03875893bb2bda5c8ef3883dec75
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
This commit is contained in:
Richard Moe Gustavsen 2022-06-02 14:22:38 +02:00 committed by Shawn Rutledge
parent c20026be93
commit 37db56d8d4
2 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/quicktemplates2/qquicktreeviewdelegate.cpp
View File

@ -278,7 +278,7 @@ void QQuickTreeViewDelegatePrivate::handleClickOnIndicator(QMouseEvent *event, b
// To not interfere with flicking, we only toggle expanded on press
// if the flickable is not interactive. Otherwise we do it on release.
const bool interactOnRelease = q->treeView()->isInteractive();
if (isPress && interactOnRelease)
if (isPress == interactOnRelease)
return;
auto view = q->treeView();

32
tests/auto/quickcontrols2/qquicktreeviewdelegate/tst_qquicktreeviewdelegate.cpp
View File

@ -88,6 +88,7 @@ private slots:
void initTestCase() override;
void showTreeView();
void expandAndCollapsUsingDoubleClick();
void expandAndCollapseClickOnIndicator_data();
void expandAndCollapseClickOnIndicator();
void pointerNavigationDisabled();
void checkPropertiesRoot();
@ -141,9 +142,21 @@ void tst_qquicktreeviewdelegate::expandAndCollapsUsingDoubleClick()
QCOMPARE(treeViewPrivate->loadedRows.count(), 1);
}
void tst_qquicktreeviewdelegate::expandAndCollapseClickOnIndicator_data()
{
QTest::addColumn<bool>("interactive");
QTest::newRow("interactive") << true;
QTest::newRow("not interactive") << false;
}
void tst_qquicktreeviewdelegate::expandAndCollapseClickOnIndicator()
{
QFETCH(bool, interactive);
LOAD_TREEVIEW("unmodified.qml");
treeView->setInteractive(interactive);
// Check that the view only has one row loaded so far (the root of the tree)
QCOMPARE(treeViewPrivate->loadedRows.count(), 1);
@ -153,18 +166,33 @@ void tst_qquicktreeviewdelegate::expandAndCollapseClickOnIndicator()
const auto indicator = item->indicator();
const QPoint localPos = QPoint(indicator->width() / 2, indicator->height() / 2);
const QPoint pos = item->window()->contentItem()->mapFromItem(indicator, localPos).toPoint();
QTest::mouseClick(item->window(), Qt::LeftButton, Qt::NoModifier, pos);
// When treeview is interactive, we toggle expanded on pointer release
// to not interfere with flicking. Otherwise we expand already on press.
if (interactive)
QTest::mouseClick(item->window(), Qt::LeftButton, Qt::NoModifier, pos);
else
QTest::mousePress(item->window(), Qt::LeftButton, Qt::NoModifier, pos);
WAIT_UNTIL_POLISHED;
// We now expect 5 rows, the root pluss it's 4 children
QCOMPARE(treeViewPrivate->loadedRows.count(), 5);
if (!interactive)
QTest::mouseRelease(item->window(), Qt::LeftButton, Qt::NoModifier, pos);
// Collapse the root again
QTest::mouseClick(item->window(), Qt::LeftButton, Qt::NoModifier, pos);
if (interactive)
QTest::mouseClick(item->window(), Qt::LeftButton, Qt::NoModifier, pos);
else
QTest::mousePress(item->window(), Qt::LeftButton, Qt::NoModifier, pos);
WAIT_UNTIL_POLISHED;
// Check that the view only has one row loaded again (the root of the tree)
QCOMPARE(treeViewPrivate->loadedRows.count(), 1);
if (!interactive)
QTest::mouseRelease(item->window(), Qt::LeftButton, Qt::NoModifier, pos);
}
void tst_qquicktreeviewdelegate::pointerNavigationDisabled()