Merge branch 'Plasma/5.19'

This commit is contained in:
Vlad Zahorodnii 2020-05-29 10:55:16 +03:00
commit 30a5b11148

View file

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