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

Do not blur behind EffectFrames with no style

Browse source
This commit is contained in:
Martin Gräßlin 2011-04-27 14:48:34 +02:00
parent c0570a660b
commit d647950ff0
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
effects.h
View file

@ -345,7 +345,7 @@ public:
virtual void setPosition(const QPoint& point);
virtual const QString& text() const;
virtual void setText(const QString& text);
EffectFrameStyle style() const {
virtual EffectFrameStyle style() const {
return m_style;
};
Plasma::FrameSvg& frame() {

2
effects/blur/blur.cpp
View file

@ -241,7 +241,7 @@ void BlurEffect::paintEffectFrame(EffectFrame *frame, QRegion region, double opa
const QRect screen(0, 0, displayWidth(), displayHeight());
bool valid = target->valid() && shader->isValid();
QRegion shape = frame->geometry().adjusted(-5, -5, 5, 5) & screen;
if (valid && !shape.isEmpty() && region.intersects(shape.boundingRect())) {
if (valid && !shape.isEmpty() && region.intersects(shape.boundingRect()) && frame->style() != EffectFrameNone) {
doBlur(shape, screen, opacity * frameOpacity);
}
effects->paintEffectFrame(frame, region, opacity, frameOpacity);

5
libkwineffects/kwineffects.h
View file

@ -1792,6 +1792,11 @@ public:
**/
virtual GLShader* shader() const = 0;
/**
* @returns The style of this EffectFrame.
**/
virtual EffectFrameStyle style() const = 0;
/**
* If @p enable is @c true cross fading between icons and text is enabled
* By default disabled. Use setCrossFadeProgress to cross fade.