Merge lp:~vthompson/ubuntu-weather-app/reboot-anchor-location-pages into lp:ubuntu-weather-app

[Victor Thompson]

* Set contentHeight declaratively.

* Set contentHeight declaratively.

Currently, if you have multiple locations and one is on the other side of the world, you will likely get a different number of days in the forecast--this causes the contentHeight to be incorrect. If the first location has 4 days of forecast, but the second only has 3, then in some cases the user will experience the first location being "clipped" to only see the first 3 days. Additionally, the 2nd location would see excessive whitespace at the end of the view.

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

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

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

LGTM :-)

P.S. Have we worked out where the +units.gu(3) is coming from yet? If not should we copy the code comment with the FIXME: ?

review: Approve

[lp:~vthompson/ubuntu-weather-app/reboot-anchor-location-pages]

48. By Victor Thompson on 2015-06-07

Add back commentary.

[Victor Thompson (vthompson)]

I've added the commentary back in.

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

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

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

Thanks for the extra commentary change :-)

review: Approve

=== modified file 'app/ui/HomePage.qml'
--- app/ui/HomePage.qml	2015-05-29 02:38:23 +0000
+++ app/ui/HomePage.qml	2015-06-07 13:39:33 +0000
@@ -95,6 +95,9 @@
         id: locationFlickable
         width: parent.width
         height: parent.height
+
+        // FIXME: not sure where the 3GU comes from, PullToRefresh or something in HomePage?
+        contentHeight: locationPages.currentItem.childrenRect.height + units.gu(3)
         contentWidth: parent.width
 
         Behavior on contentHeight {

=== modified file 'app/ui/LocationPane.qml'
--- app/ui/LocationPane.qml	2015-05-09 03:23:34 +0000
+++ app/ui/LocationPane.qml	2015-06-07 13:39:33 +0000
@@ -40,9 +40,6 @@
     height: childrenRect.height
     anchors.fill: parent.fill
 
-    // FIXME: not sure where the 3GU comes from, PullToRefresh or something in HomePage?
-    onHeightChanged: locationFlickable.contentHeight = locationItem.height + units.gu(3)
-
     function emptyIfUndefined(variable, append) {
         if (append === undefined) {
             append = ""