From 389626a2232910945b4f78b9b60ff15d71f0b93b Mon Sep 17 00:00:00 2001 From: Andrew den Exter Date: Mon, 5 Dec 2011 11:32:16 +1000 Subject: [PATCH] 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 --- 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 d3b396d..f7ce2d8 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(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) -- 1.7.2.5