From: Andrew den Exter <andrew.den-exter@nokia.com>
Date: Tue, 3 Jan 2012 03:51:56 +0000 (+1000)
Subject: Fix positioning of images on new lines in Text elements.
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=742e9798decaa5e738b8bbfe73ad223dfa321597;p=konrad%2Fqtdeclarative.git

Fix positioning of images on new lines in Text elements.

If an image in a text node is at the start of a line include the
relative position of the line when positioning it.

Task-number: QTBUG-23410
Change-Id: Ic9927bf86386374a23acfc6b4478a26f86d43ec6
Reviewed-by: Martin Jones <martin.jones@nokia.com>
---

diff --git a/src/quick/items/qquicktextnode.cpp b/src/quick/items/qquicktextnode.cpp
index f7ce2d8..fcb1c85 100644
--- a/src/quick/items/qquicktextnode.cpp
+++ b/src/quick/items/qquicktextnode.cpp
@@ -629,7 +629,7 @@ namespace {
         QRectF searchRect = rect;
         if (layoutPosition == QTextFrameFormat::InFlow) {
             if (m_currentLineTree.isEmpty()) {
-                searchRect.moveTopLeft(m_position);
+                searchRect.moveTopLeft(m_position + m_currentLine.position());
             } else {
                 const BinaryTreeNode *lastNode = m_currentLineTree.data() + m_currentLineTree.size() - 1;
                 if (lastNode->glyphRun.isRightToLeft()) {