Merge lp:~vthompson/music-app/fix-1538829-no-playlists-label into lp:music-app

[Victor Thompson]

* Fix topMargin of the Playlists empty state so title is not obscurred

* Fix topMargin of the Playlists empty state so title is not obscurred

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:981
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1082/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/639/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1082/rebuild

review: Needs Fixing (continuous-integration)

[Andrew Hayzen (ahayzen)]

One inline comment.

review: Needs Information

[Victor Thompson (vthompson)]

Using the parent's verticalCenter also doesn't work--probably for the same reason centerIn isn't...

[Andrew Hayzen (ahayzen)]

OK, this will be good enough for now then :-)

review: Approve

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
https://core-apps-jenkins.ubuntu.com/job/music-app-autolanding/89/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/5664/console

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
https://core-apps-jenkins.ubuntu.com/job/music-app-autolanding/90/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/5679/console

review: Needs Fixing (continuous-integration)

[lp:~vthompson/music-app/fix-1538829-no-playlists-label]

982. By Victor Thompson on 2016-03-09

Merge of trunk and resolve conflicts.

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:982
https://core-apps-jenkins.ubuntu.com/job/music-app-ci/96/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/724/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/music-app-ci/96/rebuild

review: Approve (continuous-integration)

=== modified file 'app/components/PlaylistsEmptyState.qml'
--- app/components/PlaylistsEmptyState.qml	2015-08-12 23:36:44 +0000
+++ app/components/PlaylistsEmptyState.qml	2016-03-09 01:10:47 +0000
@@ -24,7 +24,9 @@
 Rectangle {
     id: playlistsEmptyState
     anchors {
-        fill: parent
+        top: parent.top
+        topMargin: units.gu(11.5)
+        bottom: parent.bottom
     }
     color: mainView.backgroundColor
 

=== modified file 'debian/changelog'
--- debian/changelog	2016-02-28 01:51:17 +0000
+++ debian/changelog	2016-03-09 01:10:47 +0000
@@ -8,6 +8,7 @@
   * Fix fallback image path in MusicListItem (LP: #1549580).
   * Fix regression where AddToPlaylist.qml no long supports plural track counts (LP: #1550832).
   * Remove offset from the top of AddToPlaylist.qml (LP: #1538832).
+  * Fix topMargin of the Playlists empty state so title is not obscurred (LP: #1538829).
 
   [ Andrew Hayzen ]
   * Fix so that a press and hold cannot disable selection in the ContentHubExport.qml (LP: #1538838)