From 742e9798decaa5e738b8bbfe73ad223dfa321597 Mon Sep 17 00:00:00 2001 From: Andrew den Exter Date: Tue, 3 Jan 2012 13:51:56 +1000 Subject: [PATCH] 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 --- src/quick/items/qquicktextnode.cpp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) 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()) { -- 1.7.2.5