Add QTextFragment::glyphs() accessor

Add a function to retrieve fonts, glyph indexes and positions needed to
visualize the text in a QTextFragment to allow converting the text of
a QTextDocument to QGlyphs objects.

Reviewed-by: Simon Hausmann

1 files changed, 12 insertions, 3 deletions

diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
index aff88f6..531e46b 100644
--- a/src/gui/text/qtextlayout.cpp
+++ b/src/gui/text/qtextlayout.cpp
@@ -1134,7 +1134,7 @@ QList<QGlyphs> QTextLayout::glyphs() const
 {
     QList<QGlyphs> glyphs;
     for (int i=0; i<d->lines.size(); ++i)
-        glyphs += QTextLine(i, d).glyphs();
+        glyphs += QTextLine(i, d).glyphs(-1, -1);
 
     return glyphs;
 }
@@ -2198,13 +2198,16 @@ namespace {
 /*!
     \internal
 
-    Returns the glyph indexes and positions for all glyphs in this QTextLine.
+    Returns the glyph indexes and positions for all glyphs in this QTextLine which reside in
+    QScriptItems that overlap with the range defined by \a from and \a length. The arguments
+    specify characters, relative to the text in the layout. Note that it is not possible to
+    use this function to retrieve a subset of the glyphs in a QScriptItem.
 
     \since 4.8
 
     \sa QTextLayout::glyphs()
 */
-QList<QGlyphs> QTextLine::glyphs() const
+QList<QGlyphs> QTextLine::glyphs(int from, int length) const
 {
     const QScriptLine &line = eng->lines[i];
 
@@ -2217,7 +2220,13 @@ QList<QGlyphs> QTextLine::glyphs() const
     qreal y = line.y.toReal() + line.base().toReal();
     while (!iterator.atEnd()) {
         QScriptItem &si = iterator.next();
+        if (si.analysis.flags >= QScriptAnalysis::TabOrObject)
+            continue;
+
         QPointF pos(iterator.x.toReal(), y);
+        if (from >= 0 && length >= 0 &&
+            (from >= si.position + eng->length(&si) || from + length <= si.position))
+            continue;
 
         QFont font = eng->font(si);