Merge lp:~vthompson/music-app/fixes-1248993 into lp:music-app/trusty

[Victor Thompson]

Shift to the proper location when new tracks are added to the queue.

Shift to the proper location when new tracks are added to the queue.

This does potentially expose the bug where sometimes when tracks were added to the queue and the Now Playing screen was shown the previous tab's header would get stuck on the screen showing a white bar at the top of the screen preventing the user from being able to go back. I haven't been able to get this to happen, so I think that issue is OBE.

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

PASSED: Continuous integration, rev:241
http://91.189.93.70:8080/job/music-app-ci/307/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/136
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/307
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/309
    SUCCESS: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/28

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

Still appears to get shifted down by a very small amount, looks similar to the margin on trackContainer (units.gu(0.5)).

But it is better than before :)

review: Needs Fixing

Unmerged revisions

241. By Victor Thompson on 2013-11-14

Shift to the proper location when new tracks are added to the queue.

=== modified file 'MusicNowPlaying.qml'
--- MusicNowPlaying.qml	2013-10-29 01:38:10 +0000
+++ MusicNowPlaying.qml	2013-11-14 20:34:50 +0000
@@ -80,10 +80,7 @@
 
             // Then position the view at the current index
             queuelist.positionViewAtIndex(queuelist.currentIndex, ListView.Beginning);
-            if (queuelist.contentY > 0)
-            {
-                queuelist.contentY -= header.height;
-            }
+            queuelist.contentY -= header.height;
 
             queuelist.scrollLock = false;
         }