From 292a6707e565f226314fba541b3cdeaef5046d4e Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Tue, 11 Mar 2014 13:31:53 +0100 Subject: Ensure TextEdit's text is vertically aligned after resizing its height. The current code only updates the alignment if the width of the TextEdit changed, but we must also check if the height has changed. Task-number: QTBUG-36069 [ChangeLog][QtDeclarative][TextEdit] Fixed TextEdit not vertically aligning its text after having its height changed. Change-Id: I428a01111874c70d2151213d2b3c5553e7f21186 Reviewed-by: J-P Nurmi --- src/declarative/graphicsitems/qdeclarativetextedit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/declarative/graphicsitems') diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp index a2e8e65c..6af72e0f 100644 --- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp @@ -1032,7 +1032,7 @@ void QDeclarativeTextEdit::setTextMargin(qreal margin) void QDeclarativeTextEdit::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) { - if (newGeometry.width() != oldGeometry.width()) + if (newGeometry.size() != oldGeometry.size()) updateSize(); QDeclarativePaintedItem::geometryChanged(newGeometry, oldGeometry); } -- cgit v1.2.3