From 832c7895a0b9fcd798f4497c87742731e872247d Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Thu, 1 Oct 2009 16:38:39 +1000
Subject: Auto-resize window when a new file is opened from the Open dialog.
 Also set the Open dialog's initial directory to directory of the current
 file.

---
 tools/qmlviewer/qmlviewer.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/qmlviewer/qmlviewer.cpp b/tools/qmlviewer/qmlviewer.cpp
index 49b91af..b2884dd 100644
--- a/tools/qmlviewer/qmlviewer.cpp
+++ b/tools/qmlviewer/qmlviewer.cpp
@@ -586,7 +586,7 @@ void QmlViewer::reload()
 
 void QmlViewer::open()
 {
-    QString fileName = QFileDialog::getOpenFileName(this, tr("Open QML file"), "", tr("QML Files (*.qml)"));
+    QString fileName = QFileDialog::getOpenFileName(this, tr("Open QML file"), currentFileName, tr("QML Files (*.qml)"));
     if (!fileName.isEmpty()) {
         openQml(fileName);
         QTimer::singleShot(0, this, SLOT(reload()));
@@ -649,6 +649,7 @@ void QmlViewer::openQml(const QString& fileName)
     qWarning() << "Wall startup time:" << t.elapsed();
 
     if (!skin) {
+        canvas->updateGeometry();
         canvas->resize(canvas->sizeHint());
         resize(sizeHint());
     } else {
-- 
cgit v0.12