diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-04-20 11:40:40 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-20 08:05:15 +0200 |
| commit | 04794c29cee0d97fb3b32e1c71a072e34ee37e9c (patch) | |
| tree | b161691c1af10d24432e2cc8ba753a80c3adc7ab /tests/auto/quick/qquickitem2/tst_qquickitem.cpp | |
| parent | 2e0a348927d5d9ad47cad724bc687c72e592c8d6 (diff) | |
Fix eliding when text width is reset by an implicitWidth change.
After emitting implicit size changed signals, reevaluate any conditions
that were dependent on the validity of the item dimensions.
Change-Id: Ie4ee0c87a22cf82752c207c69d426056c36ede67
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests/auto/quick/qquickitem2/tst_qquickitem.cpp')
| -rw-r--r-- | tests/auto/quick/qquickitem2/tst_qquickitem.cpp | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp index 34f51875c9..44b05586ce 100644 --- a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp +++ b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp @@ -1350,6 +1350,48 @@ void tst_QQuickItem::implicitSize() QCOMPARE(item->width(), qreal(150)); QCOMPARE(item->height(), qreal(80)); + QMetaObject::invokeMethod(item, "assignImplicitBinding"); + + QCOMPARE(item->implicitWidth(), qreal(150)); + QCOMPARE(item->implicitHeight(), qreal(80)); + QCOMPARE(item->width(), qreal(150)); + QCOMPARE(item->height(), qreal(80)); + + QMetaObject::invokeMethod(item, "increaseImplicit"); + + QCOMPARE(item->implicitWidth(), qreal(200)); + QCOMPARE(item->implicitHeight(), qreal(100)); + QCOMPARE(item->width(), qreal(175)); + QCOMPARE(item->height(), qreal(90)); + + QMetaObject::invokeMethod(item, "changeImplicit"); + + QCOMPARE(item->implicitWidth(), qreal(150)); + QCOMPARE(item->implicitHeight(), qreal(80)); + QCOMPARE(item->width(), qreal(150)); + QCOMPARE(item->height(), qreal(80)); + + QMetaObject::invokeMethod(item, "assignUndefinedBinding"); + + QCOMPARE(item->implicitWidth(), qreal(150)); + QCOMPARE(item->implicitHeight(), qreal(80)); + QCOMPARE(item->width(), qreal(150)); + QCOMPARE(item->height(), qreal(80)); + + QMetaObject::invokeMethod(item, "increaseImplicit"); + + QCOMPARE(item->implicitWidth(), qreal(200)); + QCOMPARE(item->implicitHeight(), qreal(100)); + QCOMPARE(item->width(), qreal(175)); + QCOMPARE(item->height(), qreal(90)); + + QMetaObject::invokeMethod(item, "changeImplicit"); + + QCOMPARE(item->implicitWidth(), qreal(150)); + QCOMPARE(item->implicitHeight(), qreal(80)); + QCOMPARE(item->width(), qreal(150)); + QCOMPARE(item->height(), qreal(80)); + delete canvas; } |