diff options
| author | Marius Bugge Monsen <mmonsen@trolltech.com> | 2009-06-22 11:16:56 (GMT) |
|---|---|---|
| committer | Marius Bugge Monsen <mmonsen@trolltech.com> | 2009-06-22 11:16:56 (GMT) |
| commit | 120252acef2d81d0046b421ad2cc1455975c0052 (patch) | |
| tree | e7d518de87de63c542c8f9b899638dbe0dce6c19 /src | |
| parent | 684c43db2b5b0eda94c6893075146fa0e44f2f22 (diff) | |
| parent | 5281f264dc605766ba82c36fc2c88055234824ff (diff) | |
| download | Qt-120252acef2d81d0046b421ad2cc1455975c0052.zip Qt-120252acef2d81d0046b421ad2cc1455975c0052.tar.gz Qt-120252acef2d81d0046b421ad2cc1455975c0052.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/painting/qbackingstore.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/painting/qbackingstore.cpp b/src/gui/painting/qbackingstore.cpp index 0f7933c..3bbdf7f 100644 --- a/src/gui/painting/qbackingstore.cpp +++ b/src/gui/painting/qbackingstore.cpp @@ -258,7 +258,10 @@ void QWidgetBackingStore::unflushPaint(QWidget *widget, const QRegion &rgn) bool QWidgetBackingStore::bltRect(const QRect &rect, int dx, int dy, QWidget *widget) { const QPoint pos(tlwOffset + widget->mapTo(tlw, rect.topLeft())); - return windowSurface->scroll(QRect(pos, rect.size()), dx, dy); + const QRect tlwRect(QRect(pos, rect.size())); + if (dirty.intersects(tlwRect)) + return false; // We don't want to scroll junk. + return windowSurface->scroll(tlwRect, dx, dy); } void QWidgetBackingStore::releaseBuffer() |