}
}
-QSGGlyphNode *QSGTextNode::addGlyphs(const QPointF &position, const QGlyphs &glyphs, const QColor &color,
+QSGGlyphNode *QSGTextNode::addGlyphs(const QPointF &position, const QGlyphRun &glyphs, const QColor &color,
QSGText::TextStyle style, const QColor &styleColor)
{
QSGGlyphNode *node = m_context->createGlyphNode();
void QSGTextNode::addTextLayout(const QPointF &position, QTextLayout *textLayout, const QColor &color,
QSGText::TextStyle style, const QColor &styleColor)
{
- QList<QGlyphs> glyphsList(textLayout->glyphs());
+ QList<QGlyphRun> glyphsList(textLayout->glyphRuns());
for (int i=0; i<glyphsList.size(); ++i) {
- QGlyphs glyphs = glyphsList.at(i);
- QRawFont font = glyphs.font();
+ QGlyphRun glyphs = glyphsList.at(i);
+ QRawFont font = glyphs.rawFont();
addGlyphs(position + QPointF(0, font.ascent()), glyphs, color, style, styleColor);
}
? overrideColor
: charFormat.foreground().color();
- QList<QGlyphs> glyphsList = fragment.glyphs();
+ QList<QGlyphRun> glyphsList = fragment.glyphRuns();
for (int i=0; i<glyphsList.size(); ++i) {
- QGlyphs glyphs = glyphsList.at(i);
- QRawFont font = glyphs.font();
+ QGlyphRun glyphs = glyphsList.at(i);
+ QRawFont font = glyphs.rawFont();
QSGGlyphNode *glyphNode = addGlyphs(position + blockPosition + QPointF(0, font.ascent()),
glyphs, color, style, styleColor);
private:
void addTextBlock(const QPointF &position, QTextDocument *textDocument, const QTextBlock &block,
const QColor &overrideColor, QSGText::TextStyle style = QSGText::Normal, const QColor &styleColor = QColor());
- QSGGlyphNode *addGlyphs(const QPointF &position, const QGlyphs &glyphs, const QColor &color,
+ QSGGlyphNode *addGlyphs(const QPointF &position, const QGlyphRun &glyphs, const QColor &color,
QSGText::TextStyle style = QSGText::Normal, const QColor &styleColor = QColor());
void addTextDecorations(const QPointF &position, const QRawFont &font, const QColor &color,
qreal width, bool hasOverline, bool hasStrikeOut, bool hasUnderline);
#include <QtCore/qrect.h>
#include <QtGui/qcolor.h>
#include <QtCore/qsharedpointer.h>
-#include <QtGui/qglyphs.h>
+#include <QtGui/qglyphrun.h>
#include <QtCore/qurl.h>
QT_BEGIN_HEADER
SubPixelAntialiasing
};
- virtual void setGlyphs(const QPointF &position, const QGlyphs &glyphs) = 0;
+ virtual void setGlyphs(const QPointF &position, const QGlyphRun &glyphs) = 0;
virtual void setColor(const QColor &color) = 0;
virtual QPointF baseLine() const = 0;
}
}
-void QSGDefaultGlyphNode::setGlyphs(const QPointF &position, const QGlyphs &glyphs)
+void QSGDefaultGlyphNode::setGlyphs(const QPointF &position, const QGlyphRun &glyphs)
{
if (m_material != 0)
delete m_material;
- QRawFont font = glyphs.font();
+ QRawFont font = glyphs.rawFont();
m_material = new QSGTextMaskMaterial(font);
m_material->setColor(m_color);
~QSGDefaultGlyphNode();
virtual QPointF baseLine() const { return m_baseLine; }
- virtual void setGlyphs(const QPointF &position, const QGlyphs &glyphs);
+ virtual void setGlyphs(const QPointF &position, const QGlyphRun &glyphs);
virtual void setColor(const QColor &color);
virtual void setPreferredAntialiasingMode(AntialiasingMode) { }
private:
- QGlyphs m_glyphs;
+ QGlyphRun m_glyphs;
QPointF m_position;
QColor m_color;
#include <private/qsgcontext_p.h>
#include <private/qrawfont_p.h>
#include <qglfunctions.h>
-#include <qglyphs.h>
+#include <qglyphrun.h>
#include <qrawfont.h>
QT_BEGIN_NAMESPACE
updateMaterial();
}
-void QSGDistanceFieldGlyphNode::setGlyphs(const QPointF &position, const QGlyphs &glyphs)
+void QSGDistanceFieldGlyphNode::setGlyphs(const QPointF &position, const QGlyphRun &glyphs)
{
- QRawFont font = glyphs.font();
+ QRawFont font = glyphs.rawFont();
m_position = QPointF(position.x(), position.y() - font.ascent());
m_glyphs = glyphs;
void QSGDistanceFieldGlyphNode::updateFont()
{
- m_glyph_cache = QSGDistanceFieldGlyphCache::get(QGLContext::currentContext(), m_glyphs.font());
+ m_glyph_cache = QSGDistanceFieldGlyphCache::get(QGLContext::currentContext(), m_glyphs.rawFont());
}
void QSGDistanceFieldGlyphNode::updateMaterial()
~QSGDistanceFieldGlyphNode();
virtual QPointF baseLine() const { return m_baseLine; }
- virtual void setGlyphs(const QPointF &position, const QGlyphs &glyphs);
+ virtual void setGlyphs(const QPointF &position, const QGlyphRun &glyphs);
virtual void setColor(const QColor &color);
virtual void setPreferredAntialiasingMode(AntialiasingMode mode);
QPointF m_baseLine;
QSGDistanceFieldTextMaterial *m_material;
QPointF m_position;
- QGlyphs m_glyphs;
+ QGlyphRun m_glyphs;
QSGDistanceFieldGlyphCache *m_glyph_cache;
QSGGeometry m_geometry;
QSGText::TextStyle m_style;