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

backport the overlay caching fix

Browse Source 
svn path=/branches/KDE/4.3/kdelibs/; revision=1007006
This commit is contained in:
Marco Martin 2009-08-04 21:21:54 +00:00
parent 4a5315e3d3
commit 52dc55f769
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
framesvg.cpp
View File

@ -394,8 +394,9 @@ void FrameSvgPrivate::generateBackground(FrameData *frame)
QString id = QString::fromLatin1("%5_%4_%3_%2_%1_"). QString id = QString::fromLatin1("%5_%4_%3_%2_%1_").
arg(frame->enabledBorders).arg(size.width()).arg(size.height()).arg(prefix).arg(q->imagePath()); arg(frame->enabledBorders).arg(size.width()).arg(size.height()).arg(prefix).arg(q->imagePath());
Theme *theme = Theme::defaultTheme();
if (q->isUsingRenderingCache()) { if (q->isUsingRenderingCache()) {
Theme *theme = Theme::defaultTheme();
if (theme->findInCache(id, frame->cachedBackground) && !frame->cachedBackground.isNull()) { if (theme->findInCache(id, frame->cachedBackground) && !frame->cachedBackground.isNull()) {
return; return;
} }
@ -557,10 +558,16 @@ void FrameSvgPrivate::generateBackground(FrameData *frame)
} }
} }
//Overlays //Overlays
if (!prefix.startsWith("mask-") && q->hasElement(prefix+"overlay")) { QSize overlaySize;
frame->cachedOverlay = QPixmap();
if (!prefix.startsWith("mask-") && q->hasElement(prefix+"overlay") &&
!theme->findInCache(id, frame->cachedOverlay) &&
frame->cachedOverlay.isNull()) {
QPoint pos = QPoint(0, 0); QPoint pos = QPoint(0, 0);
QSize overlaySize = q->elementSize(prefix+"overlay"); overlaySize = q->elementSize(prefix+"overlay");
//Random pos, stretched and tiled are mutually exclusive //Random pos, stretched and tiled are mutually exclusive
if (q->hasElement(prefix + "hint-overlay-random-pos")) { if (q->hasElement(prefix + "hint-overlay-random-pos")) {
@ -577,8 +584,8 @@ void FrameSvgPrivate::generateBackground(FrameData *frame)
} }
} }
QPixmap overlay = q->alphaMask(); frame->cachedOverlay = q->alphaMask();
QPainter overlayPainter(&overlay); QPainter overlayPainter(&frame->cachedOverlay);
overlayPainter.setCompositionMode(QPainter::CompositionMode_SourceIn); overlayPainter.setCompositionMode(QPainter::CompositionMode_SourceIn);
//Tiling? //Tiling?
if (q->hasElement(prefix+"hint-overlay-tile-horizontal") || if (q->hasElement(prefix+"hint-overlay-tile-horizontal") ||
@ -593,12 +600,14 @@ void FrameSvgPrivate::generateBackground(FrameData *frame)
q->paint(&overlayPainter, QRect(overlayPos, overlaySize), prefix+"overlay"); q->paint(&overlayPainter, QRect(overlayPos, overlaySize), prefix+"overlay");
} }
overlayPainter.end(); overlayPainter.end();
p.setCompositionMode(QPainter::CompositionMode_SourceOver);
p.drawPixmap(overlayPos, overlay, QRect(overlayPos, overlaySize));
} }
cacheFrame(prefix); cacheFrame(prefix);
if (!frame->cachedOverlay.isNull()) {
p.setCompositionMode(QPainter::CompositionMode_SourceOver);
p.drawPixmap(overlayPos, frame->cachedOverlay, QRect(overlayPos, overlaySize));
}
} }
@ -627,7 +636,7 @@ void FrameSvgPrivate::cacheFrame(const QString &prefixToSave)
id = QString::fromLatin1("overlay_%7_%6_%5_%4_%3_%2_%1_"). id = QString::fromLatin1("overlay_%7_%6_%5_%4_%3_%2_%1_").
arg(overlayPos.y()).arg(overlayPos.x()).arg(frame->enabledBorders).arg(size.width()).arg(size.height()).arg(prefixToSave).arg(q->imagePath()); arg(overlayPos.y()).arg(overlayPos.x()).arg(frame->enabledBorders).arg(size.width()).arg(size.height()).arg(prefixToSave).arg(q->imagePath());
Theme::defaultTheme()->insertIntoCache(id, frame->cachedBackground, QString::number((qint64)q, 16)+prefixToSave+"overlay"); Theme::defaultTheme()->insertIntoCache(id, frame->cachedOverlay, QString::number((qint64)q, 16)+prefixToSave+"overlay");
} }
void FrameSvgPrivate::updateSizes() void FrameSvgPrivate::updateSizes()

1
private/framesvg_p.h
View File

@ -68,6 +68,7 @@ public:
FrameSvg::EnabledBorders enabledBorders; FrameSvg::EnabledBorders enabledBorders;
QPixmap cachedBackground; QPixmap cachedBackground;
QPixmap cachedOverlay;
QRegion cachedMask; QRegion cachedMask;
QSize frameSize; QSize frameSize;