diff options
| author | Iikka Eklund <iikka.eklund@digia.com> | 2014-04-01 11:46:57 +0300 |
|---|---|---|
| committer | Iikka Eklund <iikka.eklund@digia.com> | 2014-04-01 11:46:58 +0300 |
| commit | 91697f5ce50604f29e4d61e921cfab60eeaf8a61 (patch) | |
| tree | 3b3c9a062f209931a43241b19d8603b1ca3a023d | |
| parent | ec7b40e87a2b129ccecf5bc46b5f84cf5563291c (diff) | |
| parent | 292a6707e565f226314fba541b3cdeaef5046d4e (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I222f518e398b90382e452921411cfe81836ce02f
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextedit.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp index f2b72599..17a16668 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); } diff --git a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp index 31162421..7b0c650e 100644 --- a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp +++ b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp @@ -663,6 +663,19 @@ void tst_qdeclarativetextedit::vAlign() QVERIFY(textEditObject->cursorRectangle().bottom() > 100); QVERIFY(textEditObject->positionToRectangle(0).top() < 100); QVERIFY(textEditObject->positionToRectangle(0).bottom() > 100); + + // Test vertical alignment after resizing the height. + textEditObject->setHeight(textEditObject->height() - 20); + QVERIFY(textEditObject->cursorRectangle().top() < 90); + QVERIFY(textEditObject->cursorRectangle().bottom() > 90); + QVERIFY(textEditObject->positionToRectangle(0).top() < 90); + QVERIFY(textEditObject->positionToRectangle(0).bottom() > 90); + + textEditObject->setHeight(textEditObject->height() + 40); + QVERIFY(textEditObject->cursorRectangle().top() < 110); + QVERIFY(textEditObject->cursorRectangle().bottom() > 110); + QVERIFY(textEditObject->positionToRectangle(0).top() < 110); + QVERIFY(textEditObject->positionToRectangle(0).bottom() > 110); } void tst_qdeclarativetextedit::font() |