diff options
author | Andy Nichols <andy.nichols@theqtcompany.com> | 2016-04-12 13:38:27 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-04-13 09:22:30 +0000 |
commit | e42a713885d0c67de3eb2e0404b0dcae700c5b01 (patch) | |
tree | f20f1cb2aa2db7fd29a7d1cf3e7b1c9fcd58f902 /src/quick/items/qquicktextnodeengine.cpp | |
parent | 8c68adb073cb48dfd873ce66793bd5e990af68d0 (diff) |
QQuickTextNodeEngine: Use correct boundingRect when merging nodes
Use the transformed QRectF of otherNode instead of the untransformed
boundingRect of the QGlyphRun.
Change-Id: Ie2a97cccee45e2b924c2f599d8d3855aa85a4713
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Diffstat (limited to 'src/quick/items/qquicktextnodeengine.cpp')
-rw-r--r-- | src/quick/items/qquicktextnodeengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquicktextnodeengine.cpp b/src/quick/items/qquicktextnodeengine.cpp index 7b600adf53..98da3ca777 100644 --- a/src/quick/items/qquicktextnodeengine.cpp +++ b/src/quick/items/qquicktextnodeengine.cpp @@ -737,7 +737,7 @@ void QQuickTextNodeEngine::mergeProcessedNodes(QList<BinaryTreeNode *> *regularN BinaryTreeNode *otherNode = nodes.at(j); glyphIndexes += otherNode->glyphRun.glyphIndexes(); primaryNode->ranges += otherNode->ranges; - glyphBoundingRect = glyphBoundingRect.united(otherNode->glyphRun.boundingRect()); + glyphBoundingRect = glyphBoundingRect.united(otherNode->boundingRect); QVector<QPointF> otherPositions = otherNode->glyphRun.positions(); for (int k = 0; k < otherPositions.size(); ++k) |