ubuntu-touch-coreapps-reviewers team mailing list archive

[Victor Thompson <victor.thompson@xxxxxxxxx>]

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

Commit message:
* Make sure the text elides on the LocationsPage

Requested reviews:
  Ubuntu Weather Developers (ubuntu-weather-dev)
Related bugs:
  Bug #1469460 in Ubuntu Weather App: "[reboot] Location names in the LocationsPage should elide"
  https://bugs.launchpad.net/ubuntu-weather-app/+bug/1469460

For more details, see:
https://code.launchpad.net/~vthompson/ubuntu-weather-app/fix-1469460/+merge/269451

* Make sure the text elides on the LocationsPage

This was taken from the blocked ListItems branch and improved to also elide for Current location.
-- 
Your team Ubuntu Weather Developers is requested to review the proposed merge of lp:~vthompson/ubuntu-weather-app/fix-1469460 into lp:ubuntu-weather-app/reboot.

=== modified file 'app/ui/LocationsPage.qml'
--- app/ui/LocationsPage.qml	2015-08-19 22:44:54 +0000
+++ app/ui/LocationsPage.qml	2015-08-28 00:19:46 +0000
@@ -104,6 +104,7 @@
                         elide: Text.ElideRight
                         fontSize: "medium"
                         text: i18n.tr("Current Location")
+                        width: parent.width
                     }
                     Label {
                         id: currentLocationName2
@@ -118,6 +119,7 @@
                         fontSize: "small"
                         font.weight: Font.Light
                         text: name + ", " + (adminName1 == name ? countryName : adminName1)
+                        width: parent.width
                     }
                 }
 
@@ -204,6 +206,7 @@
                         elide: Text.ElideRight
                         fontSize: "medium"
                         text: name
+                        width: parent.width
                     }
                     Label {
                         id: locationName2
@@ -212,6 +215,7 @@
                         fontSize: "small"
                         font.weight: Font.Light
                         text: adminName1 == name ? countryName : adminName1
+                        width: parent.width
                     }
                 }
 

=== modified file 'debian/changelog'
--- debian/changelog	2015-08-27 13:47:07 +0000
+++ debian/changelog	2015-08-28 00:19:46 +0000
@@ -23,6 +23,7 @@
     selected (LP: #1482936)
   * Lock app in portrait mode
   * Get the condition text to be translated from the OWM API. (LP: #1487793)
+  * Make sure the text elides on the LocationsPage (LP: #1469460)
 
   [ Andrew Hayzen ]
   * Add mocked locations for autopilot and add a test using the data