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, 6 insertions, 1 deletions

diff --git a/src/quick/items/qquicktextinput_p_p.h b/src/quick/items/qquicktextinput_p_p.h
index bb00600661..165155acd0 100644
--- a/src/quick/items/qquicktextinput_p_p.h
+++ b/src/quick/items/qquicktextinput_p_p.h
@@ -125,6 +125,8 @@ public:
         , m_acceptableInput(1)
         , m_blinkStatus(0)
         , m_passwordEchoEditing(false)
+        , inLayout(false)
+        , requireImplicitWidth(false)
     {
     }
 
@@ -256,7 +258,8 @@ public:
     bool m_acceptableInput : 1;
     bool m_blinkStatus : 1;
     bool m_passwordEchoEditing : 1;
-
+    bool inLayout:1;
+    bool requireImplicitWidth:1;
 
     static inline QQuickTextInputPrivate *get(QQuickTextInput *t) {
         return t->d_func();
@@ -404,6 +407,8 @@ public:
 
     void updateLayout();
 
+    qreal getImplicitWidth() const;
+
 private:
     void removeSelectedText();
     void internalSetText(const QString &txt, int pos = -1, bool edited = true);