Merge lp:~mefrio-g/ubuntu-clock-app/fix-1272470 into lp:ubuntu-clock-app/saucy

[Mario Guerriero]

Fixes bug 1272470

[lp:~mefrio-g/ubuntu-clock-app/fix-1272470]

309. By Mario Guerriero on 2014-01-29

fix for the previous commit

[Nekhelesh Ramananthan (nik90)]

lgtm and works as expected. Nice work Mario!

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'ubuntu-clock-app.qml'
--- ubuntu-clock-app.qml	2014-01-13 12:13:55 +0000
+++ ubuntu-clock-app.qml	2014-01-29 17:28:05 +0000
@@ -39,20 +39,31 @@
     // Properties of this page
     applicationName: "com.ubuntu.clock"
 
-    width: units.gu(50)
-    height: units.gu(75)
+    width: minimumWidth
+    height: minimumHeight
+
+    // StateSaver properties
+    StateSaver.properties: "width, height"
 
     headerColor: "#57365E"
     backgroundColor: "#A55263"
     footerColor: "#D75669"
 
     // New properties of this page
+    readonly property real minimumWidth: units.gu(50)
+    readonly property real minimumHeight: units.gu(75)
     property var now
 
     // Initialization after page has loaded
     Component.onCompleted: {
         // Any init here
         Utils.log("MainView loaded");
+        // When root component is completed the StateSaver restore it to previous dimensions.
+        // If it is too small, set height and width to a proper size.
+        if((root.width < minimumWidth) || (root.height < minimumHeight)){
+            root.width = minimumWidth
+            root.height = minimumHeight
+        }
     }
 
     actions: [
@@ -217,4 +228,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file