diff options
| author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-06-25 12:36:03 (GMT) |
|---|---|---|
| committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-06-25 13:17:20 (GMT) |
| commit | 4fb0f9d8d5275c21b3d16be1170b5e7d2ed77f8d (patch) | |
| tree | baf3d29bdeb60db32f6ad3cc463ade43e79786a4 /src | |
| parent | b0f391ae8f2efc272be852f951403fa8e4a8f561 (diff) | |
| download | Qt-4fb0f9d8d5275c21b3d16be1170b5e7d2ed77f8d.zip Qt-4fb0f9d8d5275c21b3d16be1170b5e7d2ed77f8d.tar.gz Qt-4fb0f9d8d5275c21b3d16be1170b5e7d2ed77f8d.tar.bz2 | |
Partially revert be79229e
The change in processPendingUpdates was completely wrong and broke
several auto-tests.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsview.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp index 94547a5..e4decf9 100644 --- a/src/gui/graphicsview/qgraphicsview.cpp +++ b/src/gui/graphicsview/qgraphicsview.cpp @@ -802,15 +802,13 @@ void QGraphicsViewPrivate::processPendingUpdates() return; } - if (optimizationFlags & QGraphicsView::DontAdjustForAntialiasing) - dirtyBoundingRect.adjust(-1, -1, 1, 1); - else - dirtyBoundingRect.adjust(-2, -2, 2, 2); - if (viewportUpdateMode == QGraphicsView::BoundingRectViewportUpdate) { - viewport->update((dirtyRegion + dirtyBoundingRect).boundingRect()); + if (optimizationFlags & QGraphicsView::DontAdjustForAntialiasing) + viewport->update(dirtyBoundingRect.adjusted(-1, -1, 1, 1)); + else + viewport->update(dirtyBoundingRect.adjusted(-2, -2, 2, 2)); } else { - viewport->update(dirtyRegion + dirtyBoundingRect); // Already adjusted in updateRect/Region. + viewport->update(dirtyRegion); // Already adjusted in updateRect/Region. } dirtyBoundingRect = QRect(); |