diff -r 70a8526f03f2 -r 56b11cf8addb mpxplugins/viewplugins/views/commonplaybackview/src/mpxcommonplaybackviewimp.cpp --- a/mpxplugins/viewplugins/views/commonplaybackview/src/mpxcommonplaybackviewimp.cpp Tue May 11 16:10:56 2010 +0300 +++ b/mpxplugins/viewplugins/views/commonplaybackview/src/mpxcommonplaybackviewimp.cpp Tue May 25 12:39:12 2010 +0300 @@ -2504,12 +2504,6 @@ { MPX_FUNC_EX( "CMPXCommonPlaybackViewImp::DoActivateL()" ); - if( aPrevViewId.iAppUid == KAppUidMusicPlayerX && iContainer ) - { - // record the begin state for the transition animation. - iContainer->BeginTransition(); - } - iSwitchingView = EFalse; iDatabaseNotReady = EFalse; iUnsupportedNoteDisabled = EFalse; @@ -2570,6 +2564,14 @@ } } + if( aPrevViewId.iAppUid == KAppUidMusicPlayerX && iContainer ) + { + iContainer->SetTransitionType(EMPXTranstionToLeft); + // Transition was started in collection view, we end it here. + iContainer->EndTransition(); + } + + iPlaybackState = iPlaybackUtility->StateL(); MPX_DEBUG2("CMPXCommonPlaybackViewImp::DoActivateL(): state = %d", iPlaybackState); if ( iPlaybackState == EPbStateInitialising ) @@ -4076,6 +4078,8 @@ { toolbar->SetToolbarVisibility(ETrue); } + iContainer->SetRect( ClientRect()); + iContainer->DrawDeferred(); } // End of File