1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QTreeView - emit collapsed in collapseAll()

Browse Source 
When we call call collapase we emit collapsed. Therefore it should
also be emitted on collapseAll()

This partly solves:
Task-number: QTBUG-8176

Change-Id: I20c1388fcbbb60d12debb4a0b3b0d9fed41e2563
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
This commit is contained in:
Thorbjørn Lund Martsum 2012-11-07 08:08:44 +01:00 committed by The Qt Project
parent 80fa4b6c8e
commit 3260aec38e
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/widgets/itemviews/qtreeview.cpp
View File

@ -2646,7 +2646,15 @@ void QTreeView::expandAll()
void QTreeView::collapseAll() void QTreeView::collapseAll()
{ {
Q_D(QTreeView); Q_D(QTreeView);
QSet<QPersistentModelIndex> old_expandedIndexes;
old_expandedIndexes = d->expandedIndexes;
d->expandedIndexes.clear(); d->expandedIndexes.clear();
QSet<QPersistentModelIndex>::const_iterator i = old_expandedIndexes.constBegin();
for (; i != old_expandedIndexes.constEnd(); ++i) {
const QPersistentModelIndex &mi = (*i);
if (mi.isValid() && !(mi.flags() & Qt::ItemNeverHasChildren))
emit collapsed(mi);
}
doItemsLayout(); doItemsLayout();
} }

14
tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
View File

@ -1637,8 +1637,7 @@ void tst_QTreeView::expandAndCollapseAll()
for (int r = 0; r < rows; ++r) for (int r = 0; r < rows; ++r)
parents.push(model.index(r, 0, p)); parents.push(model.index(r, 0, p));
} }
// ### why is collapsed() signal not emitted? QCOMPARE(collapsedSpy.count(), 12);
// QCOMPARE(collapsedSpy.count(), count);
} }
void tst_QTreeView::expandWithNoChildren() void tst_QTreeView::expandWithNoChildren()
@ -4206,6 +4205,7 @@ void tst_QTreeView::taskQTBUG_8176_emitOnExpandAll()
QTreeWidgetItem *item5 = new QTreeWidgetItem(&tw, QStringList(QString("item 5"))); QTreeWidgetItem *item5 = new QTreeWidgetItem(&tw, QStringList(QString("item 5")));
new QTreeWidgetItem(item5, QStringList(QString("item 6"))); new QTreeWidgetItem(item5, QStringList(QString("item 6")));
QSignalSpy spy(&tw, SIGNAL(expanded(const QModelIndex&))); QSignalSpy spy(&tw, SIGNAL(expanded(const QModelIndex&)));
// expand all // expand all
tw.expandAll(); tw.expandAll();
QCOMPARE(spy.size(), 6); QCOMPARE(spy.size(), 6);
@ -4215,6 +4215,16 @@ void tst_QTreeView::taskQTBUG_8176_emitOnExpandAll()
spy.clear(); spy.clear();
tw.expandAll(); tw.expandAll();
QCOMPARE(spy.size(), 5); QCOMPARE(spy.size(), 5);
// collapse all
QSignalSpy spy2(&tw, SIGNAL(collapsed(const QModelIndex&)));
tw.collapseAll();
QCOMPARE(spy2.size(), 6);
tw.expandAll();
item2->setExpanded(false);
spy2.clear();
tw.collapseAll();
QCOMPARE(spy2.size(), 5);
} }
#ifndef QT_NO_ANIMATION #ifndef QT_NO_ANIMATION