From 1770fa632facf2f1e4bb05e7689efc939d46cfef Mon Sep 17 00:00:00 2001 From: Andrew den Exter Date: Fri, 27 Apr 2012 11:30:34 +1000 Subject: [PATCH] Don't do a layout for wrapping if there is no width binding. If no width has been set on the TextEdit then the text will never wrap so we can skip the layout on geometry changed. Task-number: QTBUG-25489 Change-Id: I3aa8dcedeeed0792f3135a4a01f90f24941d01b3 Reviewed-by: Yann Bodson --- src/quick/items/qquicktextedit.cpp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp index 6fefab4..59d78ac 100644 --- a/src/quick/items/qquicktextedit.cpp +++ b/src/quick/items/qquicktextedit.cpp @@ -1144,7 +1144,7 @@ void QQuickTextEdit::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) { Q_D(QQuickTextEdit); - if (newGeometry.width() != oldGeometry.width() && d->wrapMode != NoWrap && !d->inLayout) { + if (newGeometry.width() != oldGeometry.width() && d->wrapMode != NoWrap && widthValid() && !d->inLayout) { updateSize(); moveCursorDelegate(); } -- 1.7.2.5