1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

widgets: Remove unused QWidgetRepaintManager::dirtyRegion

Browse Source 
It is no longer needed after qt_dirtyRegion was removed in e2a1fb901.

Change-Id: I120df76b08808842b304cb8de10de23ccd0e2845
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
This commit is contained in:
Tor Arne Vestbø 2019-08-23 14:50:02 +02:00
parent 74be54684c
commit 9b3935492b
2 changed files with 0 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1291,56 +1291,6 @@ bool QWidgetRepaintManager::isDirty() const
return !(dirtyWidgets.isEmpty() && dirty.isEmpty() && dirtyRenderToTextureWidgets.isEmpty());
}
/*!
Returns the region (in top-level coordinates) that needs repaint and/or flush.
If the widget is non-zero, only the dirty region for the widget is returned
and the region will be in widget coordinates.
*/
QRegion QWidgetRepaintManager::dirtyRegion(QWidget *widget) const
{
const bool widgetDirty = widget && widget != tlw;
const QRect tlwRect(topLevelRect());
const QRect surfaceGeometry(tlwRect.topLeft(), store->size());
if (surfaceGeometry != tlwRect && surfaceGeometry.size() != tlwRect.size()) {
if (widgetDirty) {
const QRect dirtyTlwRect = QRect(QPoint(), tlwRect.size());
const QPoint offset(widget->mapTo(tlw, QPoint()));
const QRect dirtyWidgetRect(dirtyTlwRect & widget->rect().translated(offset));
return dirtyWidgetRect.translated(-offset);
}
return QRect(QPoint(), tlwRect.size());
}
// Calculate the region that needs repaint.
QRegion r(dirty);
for (int i = 0; i < dirtyWidgets.size(); ++i) {
QWidget *w = dirtyWidgets.at(i);
if (widgetDirty && w != widget && !widget->isAncestorOf(w))
continue;
r += w->d_func()->dirty.translated(w->mapTo(tlw, QPoint()));
}
// Append the region that needs flush.
r += topLevelNeedsFlush;
for (QWidget *w : needsFlushWidgets) {
if (widgetDirty && w != widget && !widget->isAncestorOf(w))
continue;
QWidgetPrivate *wd = w->d_func();
Q_ASSERT(wd->needsFlush);
r += wd->needsFlush->translated(w->mapTo(tlw, QPoint()));
}
if (widgetDirty) {
// Intersect with the widget geometry and translate to its coordinates.
const QPoint offset(widget->mapTo(tlw, QPoint()));
r &= widget->rect().translated(offset);
r.translate(-offset);
}
return r;
}
/*!
Invalidates the backing store when the widget is resized.
Static areas are never invalidated unless absolutely needed.

1
src/widgets/kernel/qwidgetrepaintmanager_p.h
View File

@ -119,7 +119,6 @@ private:
void flush(QWidget *widget, const QRegion &region, QPlatformTextureList *widgetTextures);
bool isDirty() const;
QRegion dirtyRegion(QWidget *widget = nullptr) const;
bool hasStaticContents() const;
void updateStaticContentsSize();