diff options
| author | Joona Petrell <joona.t.petrell@nokia.com> | 2010-05-26 04:31:08 (GMT) |
|---|---|---|
| committer | Joona Petrell <joona.t.petrell@nokia.com> | 2010-05-26 04:31:16 (GMT) |
| commit | dc08c8bc7aba55ff4762d70b193a053ad210fb60 (patch) | |
| tree | 9795a2929b422f03848982a07ba7b7766642a34f /tools/qml | |
| parent | 3e3a5a2a2eece6e0eff934c34f25c41699a45b78 (diff) | |
| download | Qt-dc08c8bc7aba55ff4762d70b193a053ad210fb60.zip Qt-dc08c8bc7aba55ff4762d70b193a053ad210fb60.tar.gz Qt-dc08c8bc7aba55ff4762d70b193a053ad210fb60.tar.bz2 | |
Fix for qml reloaded in qml viewer not being maximized properly on a device
Task-number:
Reviewed-by: Martin Jones
Diffstat (limited to 'tools/qml')
| -rw-r--r-- | tools/qml/qmlruntime.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/qml/qmlruntime.cpp b/tools/qml/qmlruntime.cpp index 5308e98..fe323c1 100644 --- a/tools/qml/qmlruntime.cpp +++ b/tools/qml/qmlruntime.cpp @@ -808,7 +808,9 @@ void QDeclarativeViewer::statusChanged() initialSize = canvas->sizeHint(); if (canvas->resizeMode() == QDeclarativeView::SizeRootObjectToView) { updateSizeHints(); - resize(QSize(initialSize.width(), initialSize.height()+menuBarHeight())); + if (!isFullScreen() && !isMaximized()) { + resize(QSize(initialSize.width(), initialSize.height()+menuBarHeight())); + } } } } |