ubuntu-touch-coreapps-reviewers team mailing list archive

[Victor Thompson <victor.thompson@xxxxxxxxx>]

Victor Thompson has proposed merging lp:~vthompson/ubuntu-weather-app/reboot-fix-location-reordering-text into lp:ubuntu-weather-app/reboot.

Commit message:
* Fix eliding on LocationsPage
* Hide condition data on LocationsPage when in multiselect mode

Requested reviews:
  Ubuntu Weather Developers (ubuntu-weather-dev)

For more details, see:
https://code.launchpad.net/~vthompson/ubuntu-weather-app/reboot-fix-location-reordering-text/+merge/252984

* Fix eliding on LocationsPage
* Hide condition data on LocationsPage when in multiselect mode

There are some spacing issues when in multiselect mode: http://i.imgur.com/dyz529A.png

This MP should fix that.
-- 
Your team Ubuntu Weather Developers is requested to review the proposed merge of lp:~vthompson/ubuntu-weather-app/reboot-fix-location-reordering-text into lp:ubuntu-weather-app/reboot.

=== modified file 'app/ui/LocationsPage.qml'
--- app/ui/LocationsPage.qml	2015-03-13 18:09:29 +0000
+++ app/ui/LocationsPage.qml	2015-03-14 20:12:12 +0000
@@ -96,6 +96,8 @@
                     height: locationsListItem.height
                     text: model.location.name
                     verticalAlignment: Text.AlignVCenter
+                    width: weatherImage.visible ? (locationsListItem.width / 2) - units.gu(4)
+                                                : locationsListItem.width - units.gu(16)
                 }
 
                 Image {
@@ -105,6 +107,7 @@
                     }
                     height: units.gu(3)
                     source: locationPage.iconMap[locationPages.contentItem.children[index].iconName] || ""
+                    visible: locationsPage.state === "default"
                     width: units.gu(3)
                 }
 
@@ -120,6 +123,7 @@
                     text: locationPages.contentItem.children[index].currentTemp ? locationPages.contentItem.children[index].currentTemp + settings.tempScale[1]
                                                                                 : ""
                     verticalAlignment: Text.AlignVCenter
+                    visible: locationsPage.state === "default"
                 }
             }