yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[PaintClipper::Iterator] Operate on QRegion instead of QVector of rects

Browse source 
Differential Revision: https://phabricator.kde.org/D9135
This commit is contained in:
Kai Uwe Broulik 2017-12-03 16:14:25 +01:00
parent c04c285b6a
commit 545dda7208
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libkwineffects/kwineffects.cpp
View file

@ -1490,14 +1490,14 @@ QRegion PaintClipper::paintArea()
struct PaintClipper::Iterator::Data { struct PaintClipper::Iterator::Data {
Data() : index(0) {} Data() : index(0) {}
int index; int index;
QVector< QRect > rects; QRegion region;
}; };
PaintClipper::Iterator::Iterator() PaintClipper::Iterator::Iterator()
: data(new Data) : data(new Data)
{ {
if (clip() && effects->isOpenGLCompositing()) { if (clip() && effects->isOpenGLCompositing()) {
data->rects = paintArea().rects(); data->region = paintArea();
data->index = -1; data->index = -1;
next(); // move to the first one next(); // move to the first one
} }
@ -1523,7 +1523,7 @@ bool PaintClipper::Iterator::isDone()
if (!clip()) if (!clip())
return data->index == 1; // run once return data->index == 1; // run once
if (effects->isOpenGLCompositing()) if (effects->isOpenGLCompositing())
return data->index >= data->rects.count(); // run once per each area return data->index >= data->region.rectCount(); // run once per each area
#ifdef KWIN_HAVE_XRENDER_COMPOSITING #ifdef KWIN_HAVE_XRENDER_COMPOSITING
if (effects->compositingType() == XRenderCompositing) if (effects->compositingType() == XRenderCompositing)
return data->index == 1; // run once return data->index == 1; // run once
@ -1541,10 +1541,10 @@ QRect PaintClipper::Iterator::boundingRect() const
if (!clip()) if (!clip())
return infiniteRegion(); return infiniteRegion();
if (effects->isOpenGLCompositing()) if (effects->isOpenGLCompositing())
return data->rects[ data->index ]; return *(data->region.begin() + data->index);
#ifdef KWIN_HAVE_XRENDER_COMPOSITING #ifdef KWIN_HAVE_XRENDER_COMPOSITING
if (effects->compositingType() == XRenderCompositing) if (effects->compositingType() == XRenderCompositing)
return paintArea().boundingRect(); return data->region.boundingRect();
#endif #endif
abort(); abort();
return infiniteRegion(); return infiniteRegion();