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

plugins/{blur,contrast}: Take into account window opacity

Browse source 
Fixes excessive blur/contrast behind a semi-transparent window.
This commit is contained in:
Kai Uwe Broulik 2023-08-28 19:31:40 +02:00
parent 3d2a3de07e
commit 23bbc75b12
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/plugins/backgroundcontrast/contrast.cpp
View file

@ -417,7 +417,7 @@ void ContrastEffect::drawWindow(const RenderTarget &renderTarget, const RenderVi
}
if (!shape.isEmpty()) {
doContrast(renderTarget, viewport, w, shape, screen, data.opacity(), data.projectionMatrix());
doContrast(renderTarget, viewport, w, shape, screen, w->opacity() * data.opacity(), data.projectionMatrix());
}
}

9
src/plugins/blur/blur.cpp
View file

@ -564,6 +564,7 @@ void BlurEffect::blur(const RenderTarget &renderTarget, const RenderViewport &vi
const QRect backgroundRect = blurShape.boundingRect();
const QRect deviceBackgroundRect = scaledRect(backgroundRect, viewport.scale()).toRect();
const auto opacity = w->opacity() * data.opacity();
if (renderInfo.framebuffers.size() != (m_iterationCount + 1) || renderInfo.textures[0]->size() != backgroundRect.size() || renderInfo.textures[0]->internalFormat() != textureFormat) {
renderInfo.framebuffers.clear();
@ -765,9 +766,9 @@ void BlurEffect::blur(const RenderTarget &renderTarget, const RenderViewport &vi
read->colorAttachment()->bind();
// Modulate the blurred texture with the window opacity if the window isn't opaque
if (data.opacity() < 1.0) {
if (opacity < 1.0) {
glEnable(GL_BLEND);
float o = 1.0f - data.opacity();
float o = 1.0f - (opacity);
o = 1.0f - o * o;
glBlendColor(0, 0, 0, o);
glBlendFunc(GL_CONSTANT_ALPHA, GL_ONE_MINUS_CONSTANT_ALPHA);
@ -775,7 +776,7 @@ void BlurEffect::blur(const RenderTarget &renderTarget, const RenderViewport &vi
vbo->draw(GL_TRIANGLES, 6, vertexCount);
if (data.opacity() < 1.0) {
if (opacity < 1.0) {
glDisable(GL_BLEND);
}
@ -787,7 +788,7 @@ void BlurEffect::blur(const RenderTarget &renderTarget, const RenderViewport &vi
// artifacts, which often happens due to the smooth color transitions in the blurred image.
glEnable(GL_BLEND);
if (data.opacity() < 1.0) {
if (opacity < 1.0) {
glBlendFunc(GL_CONSTANT_ALPHA, GL_ONE);
} else {
glBlendFunc(GL_ONE, GL_ONE);