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

use a frame called mask-overlay if available for the mask used for

Browse Source 
overlay: it can be independent from the window opacity mask

svn path=/trunk/KDE/kdelibs/; revision=1033726
This commit is contained in:
Marco Martin 2009-10-10 21:34:51 +00:00
parent ffcb8b6e62
commit 75b7874569
2 changed files with 52 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
framesvg.cpp
View File

@ -267,48 +267,13 @@ QRectF FrameSvg::contentsRect() const
QPixmap FrameSvg::alphaMask() const
{
FrameData *frame = d->frames[d->prefix];
if (hasElement("mask-" + d->prefix + "center")) {
QString oldPrefix = d->prefix;
// We are setting the prefix only temporary to generate
// the needed mask image
d->prefix = "mask-" + oldPrefix;
if (!d->frames.contains(d->prefix)) {
d->frames.insert(d->prefix, new FrameData(*(d->frames[oldPrefix])));
d->updateSizes();
}
FrameData *maskFrame = d->frames[d->prefix];
if (maskFrame->cachedBackground.isNull() || maskFrame->frameSize != d->frameSize(frame)) {
maskFrame->frameSize = d->frameSize(frame).toSize();
maskFrame->cachedBackground = QPixmap();
d->generateBackground(maskFrame);
if (maskFrame->cachedBackground.isNull()) {
return QPixmap();
}
}
d->prefix = oldPrefix;
return maskFrame->cachedBackground;
} else {
if (frame->cachedBackground.isNull()) {
d->generateBackground(frame);
if (frame->cachedBackground.isNull()) {
return QPixmap();
}
}
return frame->cachedBackground;
}
return d->alphaMask(QString());
}
QRegion FrameSvg::mask() const
{
FrameData *frame = d->frames[d->prefix];
frame->cachedMask = QRegion(QBitmap(alphaMask().alphaChannel().createMaskFromColor(Qt::black)));
frame->cachedMask = QRegion(QBitmap(d->alphaMask(QString()).alphaChannel().createMaskFromColor(Qt::black)));
return frame->cachedMask;
}
@ -383,6 +348,54 @@ void FrameSvg::paintFrame(QPainter *painter, const QPointF &pos)
painter->drawPixmap(pos, frame->cachedBackground);
}
QPixmap FrameSvgPrivate::alphaMask(const QString &maskType)
{
FrameData *frame = frames[prefix];
QString maskPrefix;
if (q->hasElement("mask-" + maskType + prefix + "center")) {
maskPrefix = "mask-" + maskType;
} else if (q->hasElement("mask-" + prefix + "center")) {
maskPrefix = "mask-";
}
if (!maskPrefix.isNull()) {
QString oldPrefix = prefix;
// We are setting the prefix only temporary to generate
// the needed mask image
prefix = maskPrefix + oldPrefix;
if (!frames.contains(prefix)) {
frames.insert(prefix, new FrameData(*(frames[oldPrefix])));
updateSizes();
}
FrameData *maskFrame = frames[prefix];
if (maskFrame->cachedBackground.isNull() || maskFrame->frameSize != frameSize(frame)) {
maskFrame->frameSize = frameSize(frame).toSize();
maskFrame->cachedBackground = QPixmap();
generateBackground(maskFrame);
if (maskFrame->cachedBackground.isNull()) {
return QPixmap();
}
}
prefix = oldPrefix;
return maskFrame->cachedBackground;
} else {
if (frame->cachedBackground.isNull()) {
generateBackground(frame);
if (frame->cachedBackground.isNull()) {
return QPixmap();
}
}
return frame->cachedBackground;
}
}
void FrameSvgPrivate::generateBackground(FrameData *frame)
{
if (!frame->cachedBackground.isNull()) {
@ -429,7 +442,7 @@ void FrameSvgPrivate::generateBackground(FrameData *frame)
}
}
overlay = q->alphaMask();
overlay = alphaMask("overlay");
QPainter overlayPainter(&overlay);
overlayPainter.setCompositionMode(QPainter::CompositionMode_SourceIn);
//Tiling?

1
private/framesvg_p.h
View File

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