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

Proposed by Victor Thompson on 2015-06-28
Status: Merged
Approved by: Nekhelesh Ramananthan on 2015-06-29
Approved revision: 58
Merged at revision: 59
Proposed branch: lp:~vthompson/ubuntu-weather-app/reboot-fix-settings-listitems-offset
Merge into: lp:ubuntu-weather-app
Diff against target: 52 lines (+17/-24)
1 file modified
app/ui/SettingsPage.qml (+17/-24)
To merge this branch: bzr merge lp:~vthompson/ubuntu-weather-app/reboot-fix-settings-listitems-offset
Reviewer Review Type Date Requested Status
Nekhelesh Ramananthan (community) 2015-06-28 Approve on 2015-06-29
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-06-28
Review via email: mp+263206@code.launchpad.net

Commit message

Make SettingsPage main ListItems non-flickable.

Description of the change

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

To post a comment you must log in.
Nekhelesh Ramananthan (nik90) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
23Page {23Page {
24 title: i18n.tr("Settings")24 title: i18n.tr("Settings")
2525
26 Flickable {26 Column {
27 clip: true27 id: settingsColumn
28
28 anchors.fill: parent29 anchors.fill: parent
29 contentHeight: settingsColumn.height30
30 height: parent.height31 StandardListItem {
3132 title: i18n.tr("Units")
32 Column {33 onClicked: mainPageStack.push(Qt.resolvedUrl("settings/UnitsPage.qml"))
33 id: settingsColumn34 }
3435
35 anchors.fill: parent36 StandardListItem {
3637 title: i18n.tr("Data Provider")
37 StandardListItem {38 onClicked: mainPageStack.push(Qt.resolvedUrl("settings/DataProviderPage.qml"))
38 title: i18n.tr("Units")39 }
39 onClicked: mainPageStack.push(Qt.resolvedUrl("settings/UnitsPage.qml"))40
40 }41 StandardListItem {
4142 title: i18n.tr("Refresh Interval")
42 StandardListItem {43 onClicked: mainPageStack.push(Qt.resolvedUrl("settings/RefreshIntervalPage.qml"))
43 title: i18n.tr("Data Provider")
44 onClicked: mainPageStack.push(Qt.resolvedUrl("settings/DataProviderPage.qml"))
45 }
46
47 StandardListItem {
48 title: i18n.tr("Refresh Interval")
49 onClicked: mainPageStack.push(Qt.resolvedUrl("settings/RefreshIntervalPage.qml"))
50 }
51 }44 }
52 }45 }
53}46}

Subscribers

People subscribed via source and target branches

to all changes: