Merge lp:~vthompson/ubuntu-weather-app/reboot-fix-location-reordering-text into lp:ubuntu-weather-app

Proposed by Victor Thompson
Status: Merged
Approved by: Martin Borho
Approved revision: 22
Merged at revision: 23
Proposed branch: lp:~vthompson/ubuntu-weather-app/reboot-fix-location-reordering-text
Merge into: lp:ubuntu-weather-app
Diff against target: 27 lines (+4/-0)
1 file modified
app/ui/LocationsPage.qml (+4/-0)
To merge this branch: bzr merge lp:~vthompson/ubuntu-weather-app/reboot-fix-location-reordering-text
Reviewer Review Type Date Requested Status
Martin Borho Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+252984@code.launchpad.net

This proposal supersedes a proposal from 2015-03-14.

Commit message

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

Description of the change

* 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.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Martin Borho (martin-borho) wrote :

LGTM, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/ui/LocationsPage.qml'
2--- app/ui/LocationsPage.qml 2015-03-13 18:09:29 +0000
3+++ app/ui/LocationsPage.qml 2015-03-14 20:12:12 +0000
4@@ -96,6 +96,8 @@
5 height: locationsListItem.height
6 text: model.location.name
7 verticalAlignment: Text.AlignVCenter
8+ width: weatherImage.visible ? (locationsListItem.width / 2) - units.gu(4)
9+ : locationsListItem.width - units.gu(16)
10 }
11
12 Image {
13@@ -105,6 +107,7 @@
14 }
15 height: units.gu(3)
16 source: locationPage.iconMap[locationPages.contentItem.children[index].iconName] || ""
17+ visible: locationsPage.state === "default"
18 width: units.gu(3)
19 }
20
21@@ -120,6 +123,7 @@
22 text: locationPages.contentItem.children[index].currentTemp ? locationPages.contentItem.children[index].currentTemp + settings.tempScale[1]
23 : ""
24 verticalAlignment: Text.AlignVCenter
25+ visible: locationsPage.state === "default"
26 }
27 }
28

Subscribers

People subscribed via source and target branches

to all changes: