diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-07-26 10:34:53 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-26 06:29:54 +0200 |
| commit | daf6a270888d2f70e57a838d0ba4adae954c3d22 (patch) | |
| tree | 36eb0366bdfa11eb25ba050191040c55ad644a22 /tests/auto/qtquick1 | |
| parent | 414b91ab7f11efaf89afb237d682507caec05eff (diff) | |
QDeclarativeView/QSGView SizeRootObjectToView still resizes view
Only resize view to object in SizeRootObjectToView if the view
has not had a size set, i.e. at initial construction.
Change-Id: Ic5ad3cbb3b071c3498047be893da2c7bf0957986
Fixes: QTBUG-15863
Reviewed-on: http://codereview.qt.nokia.com/2132
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'tests/auto/qtquick1')
| -rw-r--r-- | tests/auto/qtquick1/qdeclarativeview/tst_qdeclarativeview.cpp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/tests/auto/qtquick1/qdeclarativeview/tst_qdeclarativeview.cpp b/tests/auto/qtquick1/qdeclarativeview/tst_qdeclarativeview.cpp index d98215126b..325071f489 100644 --- a/tests/auto/qtquick1/qdeclarativeview/tst_qdeclarativeview.cpp +++ b/tests/auto/qtquick1/qdeclarativeview/tst_qdeclarativeview.cpp @@ -192,6 +192,23 @@ void tst_QDeclarativeView::resizemodedeclarativeitem() QCOMPARE(sceneResizedSpy2.count(), 3); delete canvas; + + canvas = new QDeclarativeView(&window); + canvas->resize(300, 300); + canvas->setResizeMode(QDeclarativeView::SizeRootObjectToView); + QCOMPARE(QSize(0,0), canvas->initialSize()); + canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/resizemodedeclarativeitem.qml")); + declarativeItem = qobject_cast<QDeclarativeItem*>(canvas->rootObject()); + QVERIFY(declarativeItem); + window.show(); + + // initial size from root object + QCOMPARE(declarativeItem->width(), 300.0); + QCOMPARE(declarativeItem->height(), 300.0); + QCOMPARE(canvas->size(), QSize(300, 300)); + QCOMPARE(canvas->size(), canvas->sizeHint()); + QCOMPARE(canvas->initialSize(), QSize(200, 200)); + delete canvas; } void tst_QDeclarativeView::resizemodegraphicswidget() |