diff options
| author | Joni Poikelin <joni.poikelin@digia.com> | 2014-10-08 08:07:09 +0300 |
|---|---|---|
| committer | Joni Poikelin <joni.poikelin@digia.com> | 2014-10-21 07:03:45 +0200 |
| commit | d9e70d1a49af347f79db7e64bdd8e2e8083a77b5 (patch) | |
| tree | e67bd9050096ec19f83c0b5f64fa14f3135b2024 /src/quick/items/qquicktextnodeengine.cpp | |
| parent | df34bd7f933fecd9807450021bb05cfaa2de5a46 (diff) | |
Fix subscript and superscript for QQuickText
Task-number: QTBUG-32948
Change-Id: I4920015b2604afbd9e2050f0225de98d5188d589
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Diffstat (limited to 'src/quick/items/qquicktextnodeengine.cpp')
| -rw-r--r-- | src/quick/items/qquicktextnodeengine.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/quick/items/qquicktextnodeengine.cpp b/src/quick/items/qquicktextnodeengine.cpp index 67ff79d20f..707b32755b 100644 --- a/src/quick/items/qquicktextnodeengine.cpp +++ b/src/quick/items/qquicktextnodeengine.cpp @@ -980,7 +980,18 @@ void QQuickTextNodeEngine::addTextBlock(QTextDocument *textDocument, const QText continue; QTextCharFormat charFormat = fragment.charFormat(); - setPosition(blockPosition); + QFont font(charFormat.font()); + QFontMetricsF fontMetrics(font); + + int fontHeight = fontMetrics.descent() + fontMetrics.ascent(); + int valign = charFormat.verticalAlignment(); + if (valign == QTextCharFormat::AlignSuperScript) + setPosition(QPointF(blockPosition.x(), blockPosition.y() - fontHeight / 2)); + else if (valign == QTextCharFormat::AlignSubScript) + setPosition(QPointF(blockPosition.x(), blockPosition.y() + fontHeight / 6)); + else + setPosition(blockPosition); + if (text.contains(QChar::ObjectReplacementCharacter)) { QTextFrame *frame = qobject_cast<QTextFrame *>(textDocument->objectForFormat(charFormat)); if (frame && frame->frameFormat().position() == QTextFrameFormat::InFlow) { |