aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/scenegraph/qsgdefaultglyphnode_p.h
diff options
context:
space:
mode:
authorYoann Lopes <yoann.lopes@digia.com>2013-03-12 18:43:21 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-05 15:38:04 +0200
commit57855fd6a2d3d0d3a1abbafa1000d6a1a7ce3d40 (patch)
tree75e3fccd73525341dfc5b66b4661afaeac5cdde6 /src/quick/scenegraph/qsgdefaultglyphnode_p.h
parentfedd27e1faa65d38a1a5b11f750b5ae2fb5c4006 (diff)
Implemented text styles for QSGDefaultGlyphNode.
Used when Text has renderType: Text.NativeRendering. Task-number: QTBUG-27867 Change-Id: Id1262ef49e26229c86ebd2533b9f6de638bc75cb Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Diffstat (limited to 'src/quick/scenegraph/qsgdefaultglyphnode_p.h')
-rw-r--r--src/quick/scenegraph/qsgdefaultglyphnode_p.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/quick/scenegraph/qsgdefaultglyphnode_p.h b/src/quick/scenegraph/qsgdefaultglyphnode_p.h
index a3d5d7c3ae..e264c1b70e 100644
--- a/src/quick/scenegraph/qsgdefaultglyphnode_p.h
+++ b/src/quick/scenegraph/qsgdefaultglyphnode_p.h
@@ -53,22 +53,24 @@ class QSGDefaultGlyphNode: public QSGGlyphNode
{
public:
QSGDefaultGlyphNode();
- ~QSGDefaultGlyphNode();
+ virtual ~QSGDefaultGlyphNode();
virtual QPointF baseLine() const { return m_baseLine; }
virtual void setGlyphs(const QPointF &position, const QGlyphRun &glyphs);
virtual void setColor(const QColor &color);
virtual void setPreferredAntialiasingMode(AntialiasingMode) { }
- virtual void setStyle(QQuickText::TextStyle) { }
- virtual void setStyleColor(const QColor &) { }
+ virtual void setStyle(QQuickText::TextStyle);
+ virtual void setStyleColor(const QColor &);
- virtual void update() { }
+ virtual void update();
-private:
+protected:
QGlyphRun m_glyphs;
QPointF m_position;
QColor m_color;
+ QQuickText::TextStyle m_style;
+ QColor m_styleColor;
QPointF m_baseLine;
QSGTextMaskMaterial *m_material;