From d7fe5cb94577c56a9fb656f6e61ec0b13f6f0a8f Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Thu, 30 Apr 2009 12:48:07 +1000
Subject: Resizable. Resizing is not propagated to canvas view and root item.
 Examples may or may not resize meaningfully. Skins are device-oriented and so
 do not resize.

---
 tools/duiviewer/qfxviewer.cpp | 12 +++++++++---
 tools/duiviewer/qfxviewer.h   |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/tools/duiviewer/qfxviewer.cpp b/tools/duiviewer/qfxviewer.cpp
index 7b39f53..b15a8bf 100644
--- a/tools/duiviewer/qfxviewer.cpp
+++ b/tools/duiviewer/qfxviewer.cpp
@@ -55,7 +55,7 @@ QFxViewer::QFxViewer(QFxTestEngine::TestMode testMode, const QString &testDir, Q
 
     QObject::connect(canvas, SIGNAL(sceneResized(QSize)), this, SLOT(sceneResized(QSize)));
     canvas->setFixedSize(width, height);
-    setFixedSize(width, height);
+    resize(width, height);
 }
 
 void QFxViewer::reload()
@@ -217,15 +217,21 @@ void QFxViewer::setRecordPeriod(int ms)
 
 void QFxViewer::sceneResized(QSize size)
 {
-    if(size.width() > 0 && size.height() > 0) {
+    if (size.width() > 0 && size.height() > 0) {
         canvas->setFixedSize(size.width(), size.height());
         if (skin)
             skin->setScreenSize(size);
         else
-            setFixedSize(size);
+            resize(size);
     }
 }
 
+void QFxViewer::resizeEvent(QResizeEvent *)
+{
+    if (!skin)
+        canvas->setFixedSize(width(),height());
+}
+
 void QFxViewer::keyPressEvent(QKeyEvent *event)
 {
     if (event->key() == Qt::Key_0 && devicemode)
diff --git a/tools/duiviewer/qfxviewer.h b/tools/duiviewer/qfxviewer.h
index 5733591..7a190c5 100644
--- a/tools/duiviewer/qfxviewer.h
+++ b/tools/duiviewer/qfxviewer.h
@@ -49,6 +49,7 @@ public slots:
 protected:
     virtual void keyPressEvent(QKeyEvent *);
     virtual void timerEvent(QTimerEvent *);
+    virtual void resizeEvent(QResizeEvent *);
 
 private:
     QString currentFileName;
-- 
cgit v0.12