Fix text wrapping and eliding with implicitWidth.

Update the implicitWidth of the item before continuing with the layout
rather than after it's completed this gives any bindings dependent on
the implicitWidth the opportunity to update the width before the layout
continues.

Task-number: QTBUG-22680
Task-number: QTBUG-24251
Change-Id: I61cd96ad9891b22d8b83937ad2c06719f88976b6
Reviewed-by: Martin Jones <martin.jones@nokia.com>

1 files changed, 12 insertions, 4 deletions

diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp
index 79df5abd11..4fa5233b9a 100644
--- a/src/quick/items/qquicktextedit.cpp
+++ b/src/quick/items/qquicktextedit.cpp
@@ -1143,7 +1143,8 @@ void QQuickTextEdit::setInputMethodHints(Qt::InputMethodHints hints)
 void QQuickTextEdit::geometryChanged(const QRectF &newGeometry,
                                   const QRectF &oldGeometry)
 {
-    if (newGeometry.width() != oldGeometry.width())
+    Q_D(QQuickTextEdit);
+    if (newGeometry.width() != oldGeometry.width() && d->wrapMode != NoWrap && !d->inLayout)
         updateSize();
     QQuickImplicitSizeItem::geometryChanged(newGeometry, oldGeometry);
 }
@@ -1857,6 +1858,13 @@ void QQuickTextEdit::updateSize()
             if (d->requireImplicitWidth) {
                 d->document->setTextWidth(-1);
                 naturalWidth = d->document->idealWidth();
+
+                const bool wasInLayout = d->inLayout;
+                d->inLayout = true;
+                setImplicitWidth(naturalWidth);
+                d->inLayout = wasInLayout;
+                if (d->inLayout)    // probably the result of a binding loop, but by letting it
+                    return;         // get this far we'll get a warning to that effect.
             }
             if (d->document->textWidth() != width())
                 d->document->setTextWidth(width());
@@ -1888,11 +1896,11 @@ void QQuickTextEdit::updateSize()
             d->document->setTextWidth(newWidth); // ### Text does not align if width is not set (QTextDoc bug)
         // ### Setting the implicitWidth triggers another updateSize(), and unless there are bindings nothing has changed.
         qreal iWidth = -1;
-        if (!widthValid())
+        if (!widthValid() && !d->requireImplicitWidth)
             iWidth = newWidth;
-        else if (d->requireImplicitWidth)
-            iWidth = naturalWidth;
+
         qreal newHeight = d->document->isEmpty() ? fm.height() : d->document->size().height();
+
         if (iWidth > -1)
             setImplicitSize(iWidth, newHeight);
         else