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

Make sure all prefixes are being used

Browse Source
This commit is contained in:
Aleix Pol 2014-07-15 19:54:45 +02:00
parent 89536abd9c
commit cf0f8d0c91
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,11 +47,7 @@ public:
void fetchPrefix() void fetchPrefix()
{ {
QString prefix = m_frameSvg->prefix(); QString elementId = m_frameSvg->actualPrefix() + FrameSvgPrivate::borderToElementId(m_border);
QString elementId = FrameSvgPrivate::borderToElementId(m_border);
if (!prefix.isEmpty())
elementId.prepend(prefix + '-');
QSize someSize = m_frameSvg->frameSvg()->elementSize(elementId); QSize someSize = m_frameSvg->frameSvg()->elementSize(elementId);
@ -395,7 +391,13 @@ void FrameSvgItem::updateDevicePixelRatio()
FrameData* FrameSvgItem::frameData() const FrameData* FrameSvgItem::frameData() const
{ {
return m_frameSvg->d->frames.value(m_frameSvg->d->prefix); //We need to do that prefix, otherwise we are fetching the requested prefix, which might be different
return m_frameSvg->d->frames.value(actualPrefix());
}
QString FrameSvgItem::actualPrefix() const
{
return m_frameSvg->d->prefix;
} }
} // Plasma namespace } // Plasma namespace

1
src/declarativeimports/core/framesvgitem.h
View File

@ -169,6 +169,7 @@ public:
virtual QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *); virtual QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *);
FrameData* frameData() const; FrameData* frameData() const;
QString actualPrefix() const;
protected: protected:
virtual void componentComplete(); virtual void componentComplete();