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

scene: Simplify optimized screen prepare pass

Browse source
This commit is contained in:
Vlad Zahorodnii 2022-03-22 16:49:33 +02:00
parent 658457df5f
commit 3ebe480976
2 changed files with 7 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/scene.cpp
View file

@ -359,23 +359,16 @@ void Scene::preparePaintSimpleScreen()
accumulateRepaints(sceneWindow->windowItem(), painted_screen, &data.paint);
// Clip out the decoration for opaque windows; the decoration is drawn in the second pass.
if (sceneWindow->isOpaque()) {
if (toplevel->opacity() == 1.0) {
const SurfaceItem *surfaceItem = sceneWindow->surfaceItem();
if (surfaceItem) {
data.opaque = surfaceItem->mapToGlobal(surfaceItem->shape());
if (Q_LIKELY(surfaceItem)) {
data.opaque = surfaceItem->mapToGlobal(surfaceItem->opaque());
}
} else if (toplevel->hasAlpha() && toplevel->opacity() == 1.0) {
const SurfaceItem *surfaceItem = sceneWindow->surfaceItem();
if (surfaceItem) {
const QRegion shape = surfaceItem->shape();
const QRegion opaque = surfaceItem->opaque();
data.opaque = surfaceItem->mapToGlobal(shape & opaque);
}
}
const AbstractClient *client = dynamic_cast<const AbstractClient *>(toplevel);
if (client && !client->decorationHasAlpha() && toplevel->opacity() == 1.0) {
data.opaque |= sceneWindow->decorationShape().translated(sceneWindow->pos());
const AbstractClient *client = dynamic_cast<const AbstractClient *>(toplevel);
if (client && !client->decorationHasAlpha()) {
data.opaque |= sceneWindow->decorationShape().translated(sceneWindow->pos());
}
}
sceneWindow->resetPaintingEnabled();
@ -806,11 +799,6 @@ bool Scene::Window::isVisible() const
return true; // Unmanaged is always visible
}
bool Scene::Window::isOpaque() const
{
return toplevel->opacity() == 1.0 && !toplevel->hasAlpha();
}
bool Scene::Window::isPaintingEnabled() const
{
return !disable_painting;

2
src/scene.h
View file

@ -323,8 +323,6 @@ public:
void disablePainting(int reason);
// is the window visible at all
bool isVisible() const;
// is the window fully opaque
bool isOpaque() const;
QRegion decorationShape() const;
void updateToplevel(Deleted *deleted);
void referencePreviousPixmap();