From: Andrew den Exter <andrew.den-exter@nokia.com>
Date: Mon, 5 Dec 2011 01:32:16 +0000 (+1000)
Subject: Fix images not displaying on lines with no text.
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=389626a2232910945b4f78b9b60ff15d71f0b93b;p=konrad%2Fqtdeclarative.git

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>
---

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<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)