Fix flow text objects in beginning of RTL block

If the block is right-to-left and starts with a text object, it
should be aligned to the right edge of the QTextLine instead
of the left one.

[ChangeLog][QtQuick][Text] Fixed placement of flowing text objects
in the start of a right-to-left block.

Task-number: QTBUG-43133
Change-Id: Id790e88f3464280f124c38b4260386b84cac8826
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

2 files changed, 17 insertions, 2 deletions

diff --git a/src/quick/items/qquicktextnodeengine.cpp b/src/quick/items/qquicktextnodeengine.cpp
index 4631b2e724..538356e679 100644
--- a/src/quick/items/qquicktextnodeengine.cpp
+++ b/src/quick/items/qquicktextnodeengine.cpp
@@ -423,7 +423,10 @@ void QQuickTextNodeEngine::addImage(const QRectF &rect, const QImage &image, qre
     QRectF searchRect = rect;
     if (layoutPosition == QTextFrameFormat::InFlow) {
         if (m_currentLineTree.isEmpty()) {
-            searchRect.moveTopLeft(m_position + m_currentLine.position() + QPointF(0,1));
+            if (m_currentTextDirection == Qt::RightToLeft)
+                searchRect.moveTopRight(m_position + m_currentLine.rect().topRight() + QPointF(0, 1));
+            else
+                searchRect.moveTopLeft(m_position + m_currentLine.position() + QPointF(0,1));
         } else {
             const BinaryTreeNode *lastNode = m_currentLineTree.data() + m_currentLineTree.size() - 1;
             if (lastNode->glyphRun.isRightToLeft()) {
@@ -952,6 +955,8 @@ void QQuickTextNodeEngine::addTextBlock(QTextDocument *textDocument, const QText
     int preeditPosition = block.isValid() ? block.layout()->preeditAreaPosition() : -1;
 #endif
 
+    setCurrentTextDirection(block.textDirection());
+
     QVarLengthArray<QTextLayout::FormatRange> colorChanges;
     mergeFormats(block.layout(), &colorChanges);
 
diff --git a/src/quick/items/qquicktextnodeengine_p.h b/src/quick/items/qquicktextnodeengine_p.h
index 91ed6f4430..18c624513a 100644
--- a/src/quick/items/qquicktextnodeengine_p.h
+++ b/src/quick/items/qquicktextnodeengine_p.h
@@ -144,7 +144,11 @@ public:
         int selectionState;
     };
 
-    QQuickTextNodeEngine() : m_hasSelection(false), m_hasContents(false) {}
+    QQuickTextNodeEngine()
+        : m_currentTextDirection(Qt::LeftToRight)
+        , m_hasSelection(false)
+        , m_hasContents(false)
+    {}
 
     bool hasContents() const { return m_hasContents; }
     void addTextBlock(QTextDocument *, const QTextBlock &, const QPointF &position, const QColor &textColor, const QColor& anchorColor, int selectionStart, int selectionEnd);
@@ -158,6 +162,11 @@ public:
         m_currentLine = currentLine;
     }
 
+    void setCurrentTextDirection(Qt::LayoutDirection textDirection)
+    {
+        m_currentTextDirection = textDirection;
+    }
+
     void addBorder(const QRectF &rect, qreal border, QTextFrameFormat::BorderStyle borderStyle,
                    const QBrush &borderBrush);
     void addFrameDecorations(QTextDocument *document, QTextFrame *frame);
@@ -247,6 +256,7 @@ private:
     QPointF m_position;
 
     QTextLine m_currentLine;
+    Qt::LayoutDirection m_currentTextDirection;
 
     QList<QPair<QRectF, QColor> > m_backgrounds;
     QList<QRectF> m_selectionRects;