alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drop the maskType nonsense, only one mask makes sense in the framesvg

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1099661
This commit is contained in:
Marco Martin 2010-03-05 22:37:44 +00:00
parent 573438a9a8
commit 5d5aa2d545
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
framesvg.cpp
View File

@ -271,13 +271,14 @@ QRectF FrameSvg::contentsRect() const
QPixmap FrameSvg::alphaMask() const
{
return d->alphaMask(QString());
//FIXME: the distinction between overlay and
return d->alphaMask();
}
QRegion FrameSvg::mask() const
{
FrameData *frame = d->frames[d->prefix];
frame->cachedMask = QRegion(QBitmap(d->alphaMask(QString()).alphaChannel().createMaskFromColor(Qt::black)));
frame->cachedMask = QRegion(QBitmap(d->alphaMask().alphaChannel().createMaskFromColor(Qt::black)));
return frame->cachedMask;
}
@ -352,14 +353,12 @@ void FrameSvg::paintFrame(QPainter *painter, const QPointF &pos)
painter->drawPixmap(pos, frame->cachedBackground);
}
QPixmap FrameSvgPrivate::alphaMask(const QString &maskType)
QPixmap FrameSvgPrivate::alphaMask()
{
FrameData *frame = frames[prefix];
QString maskPrefix;
if (!maskType.isEmpty() && q->hasElement("mask-" + maskType + '-' + prefix + "center")) {
maskPrefix = "mask-" + maskType + '-';
} else if (q->hasElement("mask-" + prefix + "center")) {
if (q->hasElement("mask-" + prefix + "center")) {
maskPrefix = "mask-";
}
@ -450,7 +449,7 @@ void FrameSvgPrivate::generateBackground(FrameData *frame)
}
}
overlay = alphaMask("overlay");
overlay = alphaMask();
QPainter overlayPainter(&overlay);
overlayPainter.setCompositionMode(QPainter::CompositionMode_SourceIn);
//Tiling?

2
private/framesvg_p.h
View File

@ -106,7 +106,7 @@ public:
frames.clear();
}
QPixmap alphaMask(const QString &maskType);
QPixmap alphaMask();
void generateBackground(FrameData *frame);
void generateFrameBackground(FrameData *frame);
QString cacheId(FrameData *frame, const QString &prefixToUse) const;