AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QGraphicsScene::update(): Keep the list of updatedRects() unique

Browse Source 
Otherwise, the rects will pile up when the item is not part of a view.

Task-number: QTBUG-54275
Change-Id: I29c989e25ce0ca1ac0b87d0388a476ef1acd9cfd
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
This commit is contained in:
Friedemann Kleint 2016-06-28 13:05:10 +02:00
parent e2d79b4963
commit 1d09b0d1b2
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/widgets/graphicsview/qgraphicsscene.cpp
View File

@ -3215,7 +3215,8 @@ void QGraphicsScene::update(const QRectF &rect)
view->d_func()->updateRectF(rect);
}
} else {
d->updatedRects << rect;
if (!d->updatedRects.contains(rect))
d->updatedRects << rect;
}
}

9
tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
View File

@ -2206,10 +2206,11 @@ void tst_QGraphicsItem::setMatrix()
QCOMPARE(spy.count(), 3);
QList<QRectF> rlist = qvariant_cast<QList<QRectF> >(spy.last().at(0));
QCOMPARE(rlist.size(), 3);
QCOMPARE(rlist.at(0), rotatedRect); // From item.setMatrix() (clearing rotated rect)
QCOMPARE(rlist.at(1), rotatedRect); // From scene.update() (updating scene rect)
QCOMPARE(rlist.at(2), unrotatedRect); // From post-update (update current state)
QCOMPARE(rlist.size(), 2);
// From item.setMatrix() (clearing rotated rect), from scene.update() (updating scene rect),
// squashed into one
QCOMPARE(rlist.at(0), rotatedRect);
QCOMPARE(rlist.at(1), unrotatedRect); // From post-update (update current state)
}
static QList<QGraphicsItem *> _paintedItems;