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 /src | |
| 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 'src')
| -rw-r--r-- | src/declarative/items/qsgview.cpp | 3 | ||||
| -rw-r--r-- | src/qtquick1/util/qdeclarativeview.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/declarative/items/qsgview.cpp b/src/declarative/items/qsgview.cpp index 1d1118950a..416b803814 100644 --- a/src/declarative/items/qsgview.cpp +++ b/src/declarative/items/qsgview.cpp @@ -351,7 +351,8 @@ void QSGViewPrivate::setRootObject(QObject *obj) if (root) { initialSize = rootObjectSize(); - if (initialSize != q->size()) { + if ((resizeMode == QSGView::SizeViewToRootObject || !q->testAttribute(Qt::WA_Resized)) + && initialSize != q->size()) { if (!(q->parentWidget() && q->parentWidget()->layout())) { q->resize(initialSize); } diff --git a/src/qtquick1/util/qdeclarativeview.cpp b/src/qtquick1/util/qdeclarativeview.cpp index 396cd399aa..ae7e07d0ce 100644 --- a/src/qtquick1/util/qdeclarativeview.cpp +++ b/src/qtquick1/util/qdeclarativeview.cpp @@ -603,7 +603,8 @@ void QDeclarativeView::setRootObject(QObject *obj) if (d->root) { d->initialSize = d->rootObjectSize(); - if (d->initialSize != size()) { + if ((d->resizeMode == QDeclarativeView::SizeViewToRootObject || !testAttribute(Qt::WA_Resized)) + && d->initialSize != size()) { if (!(parentWidget() && parentWidget()->layout())) { resize(d->initialSize); } |