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

widgets: Rename a few missed uses of QWidgetRepaintManager

Browse Source 
Change-Id: Ie28d5dea6fdf1c8728a68d419b487bc5e3e3ee16
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
This commit is contained in:
Tor Arne Vestbø 2019-08-22 16:56:03 +02:00
parent b553335651
commit 1c2bcdb57a
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/widgets/kernel/qwidgetrepaintmanager.cpp
View File

@ -478,7 +478,7 @@ void QWidgetPrivate::moveRect(const QRect &rect, int dx, int dy)
invalidateBackingStore((newRect & clipR).translated(-data.crect.topLeft())); invalidateBackingStore((newRect & clipR).translated(-data.crect.topLeft()));
} else { } else {
QWidgetRepaintManager *wbs = x->repaintManager.get(); QWidgetRepaintManager *repaintManager = x->repaintManager.get();
QRegion childExpose(newRect & clipR); QRegion childExpose(newRect & clipR);
QRegion overlappedExpose; QRegion overlappedExpose;
@ -490,7 +490,7 @@ void QWidgetPrivate::moveRect(const QRect &rect, int dx, int dy)
const QVector<QRect> rectsToScroll const QVector<QRect> rectsToScroll
= getSortedRectsToScroll(QRegion(sourceRect) - overlappedExpose, dx, dy); = getSortedRectsToScroll(QRegion(sourceRect) - overlappedExpose, dx, dy);
for (QRect rect : rectsToScroll) { for (QRect rect : rectsToScroll) {
if (wbs->bltRect(rect, dx, dy, pw)) { if (repaintManager->bltRect(rect, dx, dy, pw)) {
childExpose -= rect.translated(dx, dy); childExpose -= rect.translated(dx, dy);
} }
} }
@ -510,7 +510,7 @@ void QWidgetPrivate::moveRect(const QRect &rect, int dx, int dy)
} }
if (!childExpose.isEmpty()) { if (!childExpose.isEmpty()) {
childExpose.translate(-data.crect.topLeft()); childExpose.translate(-data.crect.topLeft());
wbs->markDirty(childExpose, q); repaintManager->markDirty(childExpose, q);
isMoved = true; isMoved = true;
} }
} }
@ -521,14 +521,14 @@ void QWidgetPrivate::moveRect(const QRect &rect, int dx, int dy)
parentExpose += QRegion(newRect) - extra->mask.translated(data.crect.topLeft()); parentExpose += QRegion(newRect) - extra->mask.translated(data.crect.topLeft());
if (!parentExpose.isEmpty()) { if (!parentExpose.isEmpty()) {
wbs->markDirty(parentExpose, pw); repaintManager->markDirty(parentExpose, pw);
pd->isMoved = true; pd->isMoved = true;
} }
if (childUpdatesEnabled) { if (childUpdatesEnabled) {
QRegion needsFlush(sourceRect); QRegion needsFlush(sourceRect);
needsFlush += destRect; needsFlush += destRect;
wbs->markDirtyOnScreen(needsFlush, pw, toplevelOffset); repaintManager->markDirtyOnScreen(needsFlush, pw, toplevelOffset);
} }
} }
} }
@ -542,8 +542,8 @@ void QWidgetPrivate::scrollRect(const QRect &rect, int dx, int dy)
if (x->inTopLevelResize) if (x->inTopLevelResize)
return; return;
QWidgetRepaintManager *wbs = x->repaintManager.get(); QWidgetRepaintManager *repaintManager = x->repaintManager.get();
if (!wbs) if (!repaintManager)
return; return;
static const bool accelEnv = qEnvironmentVariableIntValue("QT_NO_FAST_SCROLL") == 0; static const bool accelEnv = qEnvironmentVariableIntValue("QT_NO_FAST_SCROLL") == 0;
@ -574,7 +574,7 @@ void QWidgetPrivate::scrollRect(const QRect &rect, int dx, int dy)
const QVector<QRect> rectsToScroll const QVector<QRect> rectsToScroll
= getSortedRectsToScroll(QRegion(sourceRect) - overlappedExpose, dx, dy); = getSortedRectsToScroll(QRegion(sourceRect) - overlappedExpose, dx, dy);
for (const QRect &rect : rectsToScroll) { for (const QRect &rect : rectsToScroll) {
if (wbs->bltRect(rect, dx, dy, q)) { if (repaintManager->bltRect(rect, dx, dy, q)) {
childExpose -= rect.translated(dx, dy); childExpose -= rect.translated(dx, dy);
} }
} }
@ -601,14 +601,14 @@ void QWidgetPrivate::scrollRect(const QRect &rect, int dx, int dy)
if (!overlappedExpose.isEmpty()) if (!overlappedExpose.isEmpty())
invalidateBackingStore(overlappedExpose); invalidateBackingStore(overlappedExpose);
if (!childExpose.isEmpty()) { if (!childExpose.isEmpty()) {
wbs->markDirty(childExpose, q); repaintManager->markDirty(childExpose, q);
isScrolled = true; isScrolled = true;
} }
// Instead of using native scroll-on-screen, we copy from // Instead of using native scroll-on-screen, we copy from
// backingstore, giving only one screen update for each // backingstore, giving only one screen update for each
// scroll, and a solid appearance // scroll, and a solid appearance
wbs->markDirtyOnScreen(destRect, q, toplevelOffset); repaintManager->markDirtyOnScreen(destRect, q, toplevelOffset);
} }
} }