Fix TextEdit with right aligned text when size changes

Geometry change was avoiding updating size of the QTextDocument, thus
it was not able to right align before something else triggered size
change, e.g. a modification to the text. Also removed unnecessary
cursorRectangleChanged signal that was emitted when moving focus with
mouse.

Change-Id: I293fd5119473eb3def5acd1b3fbb951c12e14412
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>

1 files changed, 5 insertions, 9 deletions

diff --git a/src/quick/items/qquicktextcontrol.cpp b/src/quick/items/qquicktextcontrol.cpp
index 7fa990ba9f..8bc94b919c 100644
--- a/src/quick/items/qquicktextcontrol.cpp
+++ b/src/quick/items/qquicktextcontrol.cpp
@@ -1206,18 +1206,14 @@ void QQuickTextControlPrivate::mousePressEvent(QMouseEvent *e, const QPointF &po
         }
     }
 
-    if (interactionFlags & Qt::TextEditable) {
+    if (cursor.position() != oldCursorPos) {
         q->updateCursorRectangle(true);
-        if (cursor.position() != oldCursorPos)
-            emit q->cursorPositionChanged();
+        emit q->cursorPositionChanged();
+    }
+    if (interactionFlags & Qt::TextEditable)
         _q_updateCurrentCharFormatAndSelection();
-    } else {
-        if (cursor.position() != oldCursorPos) {
-            emit q->cursorPositionChanged();
-            q->updateCursorRectangle(true);
-        }
+    else
         selectionChanged();
-    }
     repaintOldAndNewSelection(oldSelection);
     hadSelectionOnMousePress = cursor.hasSelection();
 }