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

Merge branch 'Plasma/5.19'

Browse source
This commit is contained in:
Vlad Zahorodnii 2020-05-29 10:55:16 +03:00
commit 30a5b11148
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
effects/blur/blur.cpp
View file

@ -416,7 +416,7 @@ QRegion BlurEffect::blurRegion(const EffectWindow *w) const
const QRegion appRegion = qvariant_cast<QRegion>(value); const QRegion appRegion = qvariant_cast<QRegion>(value);
if (!appRegion.isEmpty()) { if (!appRegion.isEmpty()) {
if (w->decorationHasAlpha() && effects->decorationSupportsBlurBehind()) { if (w->decorationHasAlpha() && effects->decorationSupportsBlurBehind()) {
region = w->shape(); region = w->shape() & w->rect();
region -= w->decorationInnerRect(); region -= w->decorationInnerRect();
} }
region |= appRegion.translated(w->contentsRect().topLeft()) & region |= appRegion.translated(w->contentsRect().topLeft()) &
@ -424,12 +424,12 @@ QRegion BlurEffect::blurRegion(const EffectWindow *w) const
} else { } else {
// An empty region means that the blur effect should be enabled // An empty region means that the blur effect should be enabled
// for the whole window. // for the whole window.
region = w->shape(); region = w->shape() & w->rect();
} }
} else if (w->decorationHasAlpha() && effects->decorationSupportsBlurBehind()) { } else if (w->decorationHasAlpha() && effects->decorationSupportsBlurBehind()) {
// If the client hasn't specified a blur region, we'll only enable // If the client hasn't specified a blur region, we'll only enable
// the effect behind the decoration. // the effect behind the decoration.
region = w->shape(); region = w->shape() & w->rect();
region -= w->decorationInnerRect(); region -= w->decorationInnerRect();
} }