Merge lp:~vthompson/ubuntu-weather-app/reboot-fix-settings-listitems-offset into lp:ubuntu-weather-app

[Victor Thompson]

Make SettingsPage main ListItems non-flickable.

Make SettingsPage main ListItems non-flickable. This fixes the offset seen when the Settings page is first loaded.

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

PASSED: Continuous integration, rev:58
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/128/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/98
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/128

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/128/rebuild

review: Approve (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

This does indeed fix the offset issue for me. However I am still troubled by the fact that using a Flickable{} inside a Page{} creates an offset in the first place and we're masking the issue with another solution. That said, the MP fixes what it is supposed to and so I approve.

review: Approve

=== modified file 'app/ui/SettingsPage.qml'
--- app/ui/SettingsPage.qml	2015-06-21 14:54:05 +0000
+++ app/ui/SettingsPage.qml	2015-06-28 22:55:42 +0000
@@ -23,31 +23,24 @@
 Page {
     title: i18n.tr("Settings")
 
-    Flickable {
-        clip: true
+    Column {
+        id: settingsColumn
+
         anchors.fill: parent
-        contentHeight: settingsColumn.height
-        height: parent.height
-
-        Column {
-            id: settingsColumn
-
-            anchors.fill: parent
-
-            StandardListItem {
-                title: i18n.tr("Units")
-                onClicked: mainPageStack.push(Qt.resolvedUrl("settings/UnitsPage.qml"))
-            }
-
-            StandardListItem {
-                title: i18n.tr("Data Provider")
-                onClicked: mainPageStack.push(Qt.resolvedUrl("settings/DataProviderPage.qml"))
-            }
-
-            StandardListItem {
-                title: i18n.tr("Refresh Interval")
-                onClicked: mainPageStack.push(Qt.resolvedUrl("settings/RefreshIntervalPage.qml"))
-            }
+
+        StandardListItem {
+            title: i18n.tr("Units")
+            onClicked: mainPageStack.push(Qt.resolvedUrl("settings/UnitsPage.qml"))
+        }
+
+        StandardListItem {
+            title: i18n.tr("Data Provider")
+            onClicked: mainPageStack.push(Qt.resolvedUrl("settings/DataProviderPage.qml"))
+        }
+
+        StandardListItem {
+            title: i18n.tr("Refresh Interval")
+            onClicked: mainPageStack.push(Qt.resolvedUrl("settings/RefreshIntervalPage.qml"))
         }
     }
 }