feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Timeline: Clear excess row heights when reducing the number of rows

Browse Source 
Otherwise, if you increase the number of rows again later you get
surprising results.

Change-Id: I3ec809820716368849415f9dcdb1ec9208844353
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2015-04-09 15:34:09 +02:00
parent 34f2722515
commit 0df8cc2e02
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/timeline/timelinemodel.cpp
View File

@@ -136,6 +136,8 @@ void TimelineModel::setExpandedRowCount(int rows)
{ {
Q_D(TimelineModel); Q_D(TimelineModel);
if (d->expandedRowCount != rows) { if (d->expandedRowCount != rows) {
if (d->rowOffsets.length() > rows)
d->rowOffsets.resize(rows);
d->expandedRowCount = rows; d->expandedRowCount = rows;
emit expandedRowCountChanged(); emit expandedRowCountChanged();
if (d->expanded) if (d->expanded)

6
tests/auto/timeline/timelinemodel/tst_timelinemodel.cpp
View File

@@ -232,8 +232,12 @@ void tst_TimelineModel::height()
QCOMPARE(dummy.height(), 2 * DefaultRowHeight); QCOMPARE(dummy.height(), 2 * DefaultRowHeight);
dummy.setExpanded(true); dummy.setExpanded(true);
QCOMPARE(dummy.height(), 3 * DefaultRowHeight); QCOMPARE(dummy.height(), 3 * DefaultRowHeight);
dummy.setExpandedRowHeight(0, 80); dummy.setExpandedRowHeight(1, 80);
QCOMPARE(dummy.height(), 2 * DefaultRowHeight + 80); QCOMPARE(dummy.height(), 2 * DefaultRowHeight + 80);
dummy.clear();
dummy.loadData();
dummy.setExpanded(true);
QCOMPARE(dummy.rowHeight(1), DefaultRowHeight); // Make sure the row height gets reset.
} }
void tst_TimelineModel::count() void tst_TimelineModel::count()