Merge lp:~vthompson/music-app/fix-animation into lp:music-app/trusty

[Victor Thompson]

Fix currently playing item transition.

Fix currently playing item transition. Revision #610 [1] introduced a small regression where the animation from a non-playing item to the currently playing item on the Now Playing page would clip as the animation takes place.

[1] http://bazaar.launchpad.net/~music-app-dev/music-app/trunk/revision/610

[Andrew Hayzen (ahayzen)]

LGTM fixes the issue :)

review: Approve

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

PASSED: Continuous integration, rev:612
http://91.189.93.70:8080/job/music-app-ci/1089/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1842
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1842/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/313

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1089/rebuild

review: Approve (continuous-integration)

=== modified file 'MusicNowPlaying.qml'
--- MusicNowPlaying.qml	2014-08-29 00:33:05 +0000
+++ MusicNowPlaying.qml	2014-09-03 23:43:17 +0000
@@ -315,7 +315,7 @@
                     name: "current"
                     PropertyChanges {
                         target: queueListItem
-                        height: trackImage.height + (trackContainer.anchors.margins * 2)
+                        height: trackImage.size + (trackContainer.anchors.margins * 2)
                     }
                     PropertyChanges {
                         target: nowPlayingArtist