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
1=== modified file 'app/ui/SettingsPage.qml'
2--- app/ui/SettingsPage.qml 2015-06-21 14:54:05 +0000
3+++ app/ui/SettingsPage.qml 2015-06-28 22:55:42 +0000
4@@ -23,31 +23,24 @@
5 Page {
6 title: i18n.tr("Settings")
7
8- Flickable {
9- clip: true
10+ Column {
11+ id: settingsColumn
12+
13 anchors.fill: parent
14- contentHeight: settingsColumn.height
15- height: parent.height
16-
17- Column {
18- id: settingsColumn
19-
20- anchors.fill: parent
21-
22- StandardListItem {
23- title: i18n.tr("Units")
24- onClicked: mainPageStack.push(Qt.resolvedUrl("settings/UnitsPage.qml"))
25- }
26-
27- StandardListItem {
28- title: i18n.tr("Data Provider")
29- onClicked: mainPageStack.push(Qt.resolvedUrl("settings/DataProviderPage.qml"))
30- }
31-
32- StandardListItem {
33- title: i18n.tr("Refresh Interval")
34- onClicked: mainPageStack.push(Qt.resolvedUrl("settings/RefreshIntervalPage.qml"))
35- }
36+
37+ StandardListItem {
38+ title: i18n.tr("Units")
39+ onClicked: mainPageStack.push(Qt.resolvedUrl("settings/UnitsPage.qml"))
40+ }
41+
42+ StandardListItem {
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 }
52 }

Subscribers

People subscribed via source and target branches

to all changes: