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

Optimisation: createMaskFromColor is slow, and PanelSvg::mask() is called quite often.

Browse Source 
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=853506
This commit is contained in:
Olivier Goffart 2008-08-27 19:59:12 +00:00
parent 7ee88a1007
commit 8e96263a52
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
panelsvg.cpp
View File

@ -36,14 +36,14 @@ class PanelData
public:
PanelData()
: enabledBorders(PanelSvg::AllBorders),
cachedBackground(0),
cachedBackground(0), cachedMask(0),
panelSize(-1,-1)
{
}
PanelData(const PanelData &other)
: enabledBorders(other.enabledBorders),
cachedBackground(0),
cachedBackground(0), cachedMask(0),
panelSize(other.panelSize)
{
}
@ -55,6 +55,7 @@ public:
PanelSvg::EnabledBorders enabledBorders;
QPixmap *cachedBackground;
QBitmap *cachedMask;
QSizeF panelSize;
//measures
@ -330,12 +331,15 @@ QRectF PanelSvg::contentsRect() const
QBitmap PanelSvg::mask() const
{
PanelData *panel = d->panels[d->prefix];
if (!panel->cachedBackground) {
d->generateBackground(panel);
Q_ASSERT(panel->cachedBackground);
if (!panel->cachedMask) {
if (!panel->cachedBackground) {
d->generateBackground(panel);
Q_ASSERT(panel->cachedBackground);
}
panel->cachedMask = new QBitmap(panel->cachedBackground->alphaChannel().createMaskFromColor(Qt::black));
}
return panel->cachedBackground->alphaChannel().createMaskFromColor(Qt::black);
return *(panel->cachedMask);
}
void PanelSvg::setCacheAllRenderedPanels(bool cache)
@ -579,6 +583,8 @@ void PanelSvgPrivate::updateSizes()
delete panel->cachedBackground;
panel->cachedBackground = 0;
delete panel->cachedMask;
panel->cachedMask = 0;
q->Svg::resize();
if (panel->enabledBorders & PanelSvg::TopBorder) {