scene: Rename Phase2Data::clip to Phase2Data::opaque

It makes code easier to understand.
This commit is contained in:
Vlad Zahorodnii 2022-02-17 12:16:29 +02:00
parent aac0609bb9
commit 253b0ed808
2 changed files with 5 additions and 5 deletions

View file

@ -346,7 +346,7 @@ void Scene::preparePaintGenericScreen()
m_paintContext.phase2Data.append(Phase2Data{ m_paintContext.phase2Data.append(Phase2Data{
.window = sceneWindow, .window = sceneWindow,
.region = infiniteRegion(), .region = infiniteRegion(),
.clip = data.clip, .opaque = data.clip,
.mask = data.mask, .mask = data.mask,
}); });
} }
@ -392,7 +392,7 @@ void Scene::preparePaintSimpleScreen()
m_paintContext.phase2Data.append(Phase2Data{ m_paintContext.phase2Data.append(Phase2Data{
.window = sceneWindow, .window = sceneWindow,
.region = data.paint, .region = data.paint,
.clip = data.clip, .opaque = data.clip,
.mask = data.mask, .mask = data.mask,
}); });
} }
@ -405,7 +405,7 @@ void Scene::preparePaintSimpleScreen()
const auto &paintData = m_paintContext.phase2Data.at(i); const auto &paintData = m_paintContext.phase2Data.at(i);
surfaceDamage += paintData.region - opaque; surfaceDamage += paintData.region - opaque;
if (!(paintData.mask & PAINT_WINDOW_TRANSLUCENT)) { if (!(paintData.mask & PAINT_WINDOW_TRANSLUCENT)) {
opaque += paintData.clip; opaque += paintData.opaque;
} }
} }
@ -554,7 +554,7 @@ void Scene::paintSimpleScreen(int, const QRegion &region)
data->region = visible & item->mapToGlobal(item->boundingRect()); data->region = visible & item->mapToGlobal(item->boundingRect());
if (!(data->mask & PAINT_WINDOW_TRANSLUCENT)) { if (!(data->mask & PAINT_WINDOW_TRANSLUCENT)) {
visible -= data->clip; visible -= data->opaque;
} }
} }

View file

@ -250,7 +250,7 @@ protected:
struct Phase2Data { struct Phase2Data {
Window *window = nullptr; Window *window = nullptr;
QRegion region; QRegion region;
QRegion clip; QRegion opaque;
int mask = 0; int mask = 0;
}; };