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

Move QSGTexture memory management into QSGSimpleTextureNode subclass

Browse Source
This commit is contained in:
David Edmundson 2014-02-21 00:44:42 +01:00
parent d7b8ba265b
commit 1eb0deb0df
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/declarativeimports/core/svgitem.cpp
View File

@ -19,7 +19,6 @@
#include "svgitem.h" #include "svgitem.h"
#include <QPainter>
#include <QQuickWindow> #include <QQuickWindow>
#include <QSGTexture> #include <QSGTexture>
#include <QSGSimpleTextureNode> #include <QSGSimpleTextureNode>
@ -31,9 +30,22 @@
namespace Plasma namespace Plasma
{ {
class SVGTextureNode : public QSGSimpleTextureNode
{
public:
SVGTextureNode() {}
void setTexture(QSGTexture *texture);
private:
QScopedPointer<QSGTexture> m_texture;
};
void SVGTextureNode::setTexture(QSGTexture *texture) {
m_texture.reset(texture);
QSGSimpleTextureNode::setTexture(texture);
}
SvgItem::SvgItem(QQuickItem *parent) SvgItem::SvgItem(QQuickItem *parent)
: QQuickItem(parent), : QQuickItem(parent),
m_texture(0),
m_smooth(false) m_smooth(false)
{ {
setFlag(QQuickItem::ItemHasContents, true); setFlag(QQuickItem::ItemHasContents, true);
@ -42,7 +54,6 @@ SvgItem::SvgItem(QQuickItem *parent)
SvgItem::~SvgItem() SvgItem::~SvgItem()
{ {
delete m_texture;
} }
void SvgItem::setElementId(const QString &elementID) void SvgItem::setElementId(const QString &elementID)
@ -125,30 +136,27 @@ bool SvgItem::smooth() const
QSGNode *SvgItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *updatePaintNodeData) QSGNode *SvgItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *updatePaintNodeData)
{ {
Q_UNUSED(updatePaintNodeData)
if (!window() || !m_svg) { if (!window() || !m_svg) {
delete oldNode; delete oldNode;
return 0; return 0;
} }
QSGSimpleTextureNode *textureNode = static_cast<QSGSimpleTextureNode *>(oldNode); SVGTextureNode *textureNode = static_cast<SVGTextureNode *>(oldNode);
if (!textureNode) { if (!textureNode) {
textureNode = new QSGSimpleTextureNode; textureNode = new SVGTextureNode;
} }
//TODO use a heuristic to work out when to redraw //TODO use a heuristic to work out when to redraw
//if !m_smooth and size is approximate simply change the textureNode.rect without //if !m_smooth and size is approximate simply change the textureNode.rect without
//updating the material //updating the material
if (!m_texture || m_texture->textureSize() != QSize(width(), height())) { if (!textureNode->texture() || textureNode->texture()->textureSize() != QSize(width(), height())) {
m_svg.data()->resize(width(), height()); m_svg.data()->resize(width(), height());
m_svg.data()->setContainsMultipleImages(!m_elementID.isEmpty()); m_svg.data()->setContainsMultipleImages(!m_elementID.isEmpty());
const QImage image = m_svg.data()->image(m_elementID); const QImage image = m_svg.data()->image(m_elementID);
delete m_texture; QSGTexture *texture = window()->createTextureFromImage(image);
m_texture = window()->createTextureFromImage(image); textureNode->setTexture(texture);
textureNode->setTexture(m_texture);
textureNode->setRect(0, 0, width(), height()); textureNode->setRect(0, 0, width(), height());
} }

2
src/declarativeimports/core/svgitem.h
View File

@ -22,7 +22,6 @@
#include <QQuickItem> #include <QQuickItem>
class QImage; class QImage;
class QSGTexture;
namespace Plasma { namespace Plasma {
class Svg; class Svg;
@ -105,7 +104,6 @@ protected Q_SLOTS:
private: private:
QWeakPointer<Plasma::Svg> m_svg; QWeakPointer<Plasma::Svg> m_svg;
QString m_elementID; QString m_elementID;
QSGTexture *m_texture;
bool m_smooth; bool m_smooth;
}; };
} }