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

Put compose over border onto the slow path that renders the entire item

Browse Source
This commit is contained in:
David Edmundson 2014-07-17 19:32:17 +02:00
parent 09e23eb675
commit 2bf3466b53
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/declarativeimports/core/framesvgitem.cpp
View File

@ -305,6 +305,11 @@ void FrameSvgItem::geometryChanged(const QRectF &newGeometry,
void FrameSvgItem::doUpdate() void FrameSvgItem::doUpdate()
{ {
FrameData *frame = frameData();
if (!frame) {
return;
}
if (implicitWidth() <= 0) { if (implicitWidth() <= 0) {
setImplicitWidth(m_frameSvg->marginSize(Plasma::Types::LeftMargin) + m_frameSvg->marginSize(Plasma::Types::RightMargin)); setImplicitWidth(m_frameSvg->marginSize(Plasma::Types::LeftMargin) + m_frameSvg->marginSize(Plasma::Types::RightMargin));
} }
@ -314,7 +319,7 @@ void FrameSvgItem::doUpdate()
} }
bool hasOverlay = !actualPrefix().startsWith(QLatin1String("mask-")) && m_frameSvg->hasElement(actualPrefix() % "overlay"); bool hasOverlay = !actualPrefix().startsWith(QLatin1String("mask-")) && m_frameSvg->hasElement(actualPrefix() % "overlay");
m_fastPath = !hasOverlay; m_fastPath = !hasOverlay && !frame->composeOverBorder;
m_textureChanged = true; m_textureChanged = true;
update(); update();
} }