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

widgets: Use single return in QWidgetRepaintManager::markNeedsFlush

Browse Source 
Change-Id: Ia21c5c57e4c642af2aa87b0539c4af51500a4827
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
This commit is contained in:
Tor Arne Vestbø 2019-08-22 17:37:32 +02:00
parent 0af7e5564c
commit dbab68a127
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1018,30 +1018,25 @@ void QWidgetRepaintManager::markNeedsFlush(QWidget *widget, const QRegion &regio
if (!widget || widget->d_func()->paintOnScreen() || region.isEmpty())
return;
// Top-level.
if (widget == tlw) {
// Top-level (native)
if (!widget->testAttribute(Qt::WA_WState_InPaintEvent))
needsFlush += region;
return;
}
// Alien widgets.
if (!hasPlatformWindow(widget) && !widget->isWindow()) {
QWidget *nativeParent = widget->nativeParentWidget(); // Alien widgets with the top-level as the native parent (common case).
} else if (!hasPlatformWindow(widget) && !widget->isWindow()) {
QWidget *nativeParent = widget->nativeParentWidget();
if (nativeParent == tlw) {
// Alien widgets with the top-level as the native parent (common case)
if (!widget->testAttribute(Qt::WA_WState_InPaintEvent))
needsFlush += region.translated(topLevelOffset);
return;
} else {
// Alien widgets with native parent != tlw
const QPoint nativeParentOffset = widget->mapTo(nativeParent, QPoint());
appendDirtyOnScreenWidget(nativeParent, region.translated(nativeParentOffset));
}
// Alien widgets with native parent != tlw
const QPoint nativeParentOffset = widget->mapTo(nativeParent, QPoint());
appendDirtyOnScreenWidget(nativeParent, region.translated(nativeParentOffset));
return;
} else {
// Native child widgets
appendDirtyOnScreenWidget(widget, region);
}
// Native child widgets
appendDirtyOnScreenWidget(widget, region);
}
void QWidgetRepaintManager::appendDirtyOnScreenWidget(QWidget *widget, const QRegion &region)