diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2011-12-05 11:32:16 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-07 05:49:46 +0100 |
| commit | 389626a2232910945b4f78b9b60ff15d71f0b93b (patch) | |
| tree | a983b1b2a0c99223b40d2513a915938e0ae2df98 /src/quick/items/qquicktextnode.cpp | |
| parent | 8f57fae59ca501b968c3e7d27100e4753b1e0602 (diff) | |
Fix images not displaying on lines with no text.
Update the current line when adding an image if it positioned at the
start of the line.
Change-Id: I7c29f8c3a8d8923030c473446bb6d03bfb524b49
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Diffstat (limited to 'src/quick/items/qquicktextnode.cpp')
| -rw-r--r-- | src/quick/items/qquicktextnode.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/quick/items/qquicktextnode.cpp b/src/quick/items/qquicktextnode.cpp index d3b396d469..f7ce2d804d 100644 --- a/src/quick/items/qquicktextnode.cpp +++ b/src/quick/items/qquicktextnode.cpp @@ -1166,6 +1166,13 @@ void QQuickTextNode::addTextDocument(const QPointF &, QTextDocument *textDocumen if (text.contains(QChar::ObjectReplacementCharacter)) { QTextFrame *frame = qobject_cast<QTextFrame *>(textDocument->objectForFormat(charFormat)); if (frame && frame->frameFormat().position() == QTextFrameFormat::InFlow) { + int blockRelativePosition = textPos - block.position(); + QTextLine line = block.layout()->lineForTextPosition(blockRelativePosition); + if (!engine.currentLine().isValid() + || line.lineNumber() != engine.currentLine().lineNumber()) { + engine.setCurrentLine(line); + } + BinaryTreeNode::SelectionState selectionState = (selectionStart < textPos + text.length() && selectionEnd >= textPos) |