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

ScreenEdge helper effect supports QPainter Compositing

Browse source
This commit is contained in:
Martin Gräßlin 2013-06-21 15:34:40 +02:00
parent 16a82e5fa9
commit 57eb00977b
2 changed files with 48 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
effects/screenedge/screenedgeeffect.cpp
View file

@ -134,6 +134,38 @@ void ScreenEdgeEffect::paintScreen(int mask, QRegion region, ScreenPaintData &da
xRenderBlendPicture(opacity), effects->xrenderBufferPicture(), xRenderBlendPicture(opacity), effects->xrenderBufferPicture(),
0, 0, 0, 0, x, y, width, height); 0, 0, 0, 0, x, y, width, height);
#endif #endif
} else if (effects->compositingType() == QPainterCompositing) {
QImage tmp((*it)->image->size(), QImage::Format_ARGB32_Premultiplied);
tmp.fill(Qt::transparent);
QPainter p(&tmp);
p.drawImage(0, 0, *(*it)->image.data());
QColor color(Qt::transparent);
color.setAlphaF(opacity);
p.setCompositionMode(QPainter::CompositionMode_DestinationIn);
p.fillRect(QRect(QPoint(0, 0), tmp.size()), color);
p.end();
QPainter *painter = effects->scenePainter();
const QRect &rect = (*it)->geometry;
const QSize &size = (*it)->pictureSize;
int x = rect.x();
int y = rect.y();
switch ((*it)->border) {
case ElectricTopRight:
x = rect.x() + rect.width() - size.width();
break;
case ElectricBottomRight:
x = rect.x() + rect.width() - size.width();
y = rect.y() + rect.height() - size.height();
break;
case ElectricBottomLeft:
y = rect.y() + rect.height() - size.height();
break;
default:
// nothing
break;
}
painter->drawImage(QPoint(x, y), tmp);
} }
} }
} }
@ -155,6 +187,8 @@ void ScreenEdgeEffect::edgeApproaching(ElectricBorder border, qreal factor, cons
#ifdef KWIN_HAVE_XRENDER_COMPOSITING #ifdef KWIN_HAVE_XRENDER_COMPOSITING
(*it)->picture.reset(createEdgeGlow<XRenderPicture>(border, geometry.size())); (*it)->picture.reset(createEdgeGlow<XRenderPicture>(border, geometry.size()));
#endif #endif
} else if (effects->compositingType() == QPainterCompositing) {
(*it)->image.reset(createEdgeGlow<QImage>(border, geometry.size()));
} }
} }
} }
@ -209,6 +243,18 @@ Glow *ScreenEdgeEffect::createGlow(ElectricBorder border, qreal factor, const QR
return NULL; return NULL;
} }
#endif #endif
} else if (effects->compositingType() == QPainterCompositing) {
if (border == ElectricTopLeft || border == ElectricTopRight || border == ElectricBottomRight || border == ElectricBottomLeft) {
glow->image.reset(createCornerGlow<QImage>(border));
glow->pictureSize = cornerGlowSize(border);
} else {
glow->image.reset(createEdgeGlow<QImage>(border, geometry.size()));
glow->pictureSize = geometry.size();
}
if (glow->image.isNull()) {
delete glow;
return NULL;
}
} }
return glow; return glow;

3
effects/screenedge/screenedgeeffect.h
View file

@ -58,10 +58,11 @@ class Glow
{ {
public: public:
QScopedPointer<GLTexture> texture; QScopedPointer<GLTexture> texture;
QScopedPointer<QImage> image;
#ifdef KWIN_HAVE_XRENDER_COMPOSITING #ifdef KWIN_HAVE_XRENDER_COMPOSITING
QScopedPointer<XRenderPicture> picture; QScopedPointer<XRenderPicture> picture;
QSize pictureSize;
#endif #endif
QSize pictureSize;
qreal strength; qreal strength;
QRect geometry; QRect geometry;
ElectricBorder border; ElectricBorder border;