FCL/sf/app/musicplayer: comparison mpxplugins/viewplugins/views/collectionviewhg/src/mpxcollectionviewhgcontainer.cpp

equal deleted inserted replaced

-:bdd9da0d70fe
+:1f1dad4af8f8
 	iOpenAlbumTracks(EFalse),
 	iShuffleItem(0),
 	iSetEmptyTextNeeded(EFalse),
 	iPopupListRect(TRect(0,0,0,0)),
 	iPreviousViewId(TUid::Uid(0)),
-	iDrawBackGround(EFalse),
+	iDrawBackGround(EFalse)
-	iIsNowPlayingView(EFalse)
 {
 }
 // ---------------------------------------------------------------------------
 // Destructor
 TRect clientRect = ((CAknView*)iView)->ClientRect();
 SetRect( clientRect );
 iBgContext->SetRect(((CAknAppUi*)iCoeEnv->AppUi())->ApplicationRect());
-			if ( iCurrentViewType == EMPXViewMediawall )
+// call HandleLbxItemAdditionL
-				{
+HandleLbxItemAdditionL();
-				PrepareTboneViewL();
-				}
-			else
-				{
-	            // call HandleLbxItemAdditionL
-	            HandleLbxItemAdditionL();
-				}
 }
 );
 if(iMediaWall)
 iMediaWall->HandleResourceChange( aType );
 if(iListWidget)
 //
 TInt CMPXCollectionViewHgContainer::TopLbxItemIndex() const
 {
 MPX_FUNC( "CMPXCollectionViewHgContainer::TopLbxItemIndex" );
 return iTopIndex;
-}
-// -----------------------------------------------------------------------------
-// Gets first listbox item index on screen(relative to the original listbox).
-// -----------------------------------------------------------------------------
-//
-TInt CMPXCollectionViewHgContainer::FirstIndexOnScreen() const
-{
-MPX_FUNC( "CMPXCollectionViewHgContainer::FirstIndexOnScreen" );
-TInt index = 0;
-if ( iListWidget )
-{
-index = iListWidget->FirstIndexOnScreen();
-}
-return index;
 }
 // -----------------------------------------------------------------------------
 // Gets bottom listbox item index (relative to the original listbox).
 // We only need to use this for one transition coming
 // from playback view.
 TBool pbv = (iPreviousViewId == TUid::Uid(KMPXPluginTypePlaybackUid)) ? ETrue : EFalse;
 if ( pbv )
 {
-iIsNowPlayingView = ETrue;
 	iPreviousViewId = TUid::Uid(0);
 	SetupTransitionType(KMPXInterviewTransition, pbv);
 }
 else // intraview transitions
 				{
 }
 case EMPXViewTBone:
 {
 RestoreSelectedAlbumItemL(mediaArray);
 PrepareMediaWallWithListL( mediaArray, count );
+// We need to adjust the CBA for this view.
+if( iCbaHandler )
+{
+iCbaHandler->UpdateCba();
+}
 break;
 }
 case EMPXViewList:
 {
 PrepareListL(mediaArray, count);
 iListWidget->SetMenuProviderL(this);
 iListWidget->SetSelectionObserver(*this);
 // TODO. check if this is correct for all lists
 iListWidget->ClearFlags( CHgScroller::EHgScrollerKeyMarkingDisabled );
 iListWidget->SetFocus(ETrue);
-if( iContext == EContextItemPlaylist )
+iListWidget->SetScrollBarTypeL( CHgScroller::EHgScrollerLetterStripLite );
-{
-iListWidget->SetScrollBarTypeL( CHgScroller::EHgScrollerScrollBar);
-}
-else
-{
-iListWidget->SetScrollBarTypeL( CHgScroller::EHgScrollerLetterStripLite );
-}
 iListWidget->DrawableWindow()->SetOrdinalPosition( -1 );
 iListWidget->DrawableWindow()->SetFaded(((CAknAppUi*)iCoeEnv->AppUi())->IsFaded(), RWindowTreeNode::EFadeIncludeChildren);
 ProvideDataWithoutThumbnailsL(aMediaArray);
 }
 else
 {
 iListWidget->Reset();
 iListWidget->ResizeL( aCount );
 iListWidget->SetFocus(ETrue);
-if( iContext == EContextItemPlaylist )
-{
-iListWidget->SetScrollBarTypeL( CHgScroller::EHgScrollerScrollBar);
-}
-else
-{
-iListWidget->SetScrollBarTypeL( CHgScroller::EHgScrollerLetterStripLite );
-}
 ProvideDataWithoutThumbnailsL(aMediaArray);
 iListWidget->MakeVisible(ETrue);
 iListWidget->InitScreenL(clientRect);
 }
 	// Now create the media wall & the list
 ((CAknAppUi*)iCoeEnv->AppUi())->StatusPane()->MakeVisible(EFalse);
 iThumbnailManager->SetSizeL( EAudioGridThumbnailSize );
-if( iCbaHandler )
-{
-iCbaHandler->UpdateCba();
-}
 TRect clientRect = ((CAknView*)iView)->ClientRect();
 TAknLayoutRect mediawallLayout;
 mediawallLayout.LayoutRect( clientRect, AknLayoutScalable_Apps::cf0_flow_pane(0) );
 switchBuffer = CMPXCollectionViewHgSwitchBuffer::CreateBufferLC( *iListWidget );
 }
 else if ( iMediaWall && iPrevViewType == EMPXViewTBone )
 {
 switchBuffer = CMPXCollectionViewHgSwitchBuffer::CreateBufferLC( *iMediaWall );
-if (aMediaArray.Count()>1)
+switchBuffer->SetIndexOffset(1);
-{
-switchBuffer->SetIndexOffset(1);
-}
 }
 if( iMediaWall )
 {
 delete iMediaWall;
 iMediaWall = 0;
 iMwListWidget = 0;
 }
 	if (!iMediaWall)
 	    {
-	    if ( iIsNowPlayingView )
+iMediaWall = CHgVgMediaWall::NewL(
-	        {
+appRect,
-			// back from now playing view, create mediawall with empty albumart icon to avoid flickering
+aCount,
-	        iMediaWall = CHgVgMediaWall::NewL(
+CHgVgMediaWall::EHgVgMediaWallStyleCoverflowFullScreen,
-	                appRect,
+ETrue,
-	                aCount,
+this,
-	                CHgVgMediaWall::EHgVgMediaWallStyleCoverflowFullScreen,
+DefaultIconL() );
-	                ETrue,
-	                this,
-	                CGulIcon::NewL( new CFbsBitmap()) );
-	        }
-	    else
-	        {
-	        iMediaWall = CHgVgMediaWall::NewL(
-	                appRect,
-	                aCount,
-	                CHgVgMediaWall::EHgVgMediaWallStyleCoverflowFullScreen,
-	                ETrue,
-	                this,
-	                DefaultIconL() );
-	        }
 if( !iIsForeground )
 iMediaWall->HandleLosingForeground();
 iMediaWall->SetMopParent(this);
 iMediaWall->SetSelectionObserver(*this);
 {
 switchBuffer->FillFromBufferL( *iMediaWall );
 CleanupStack::PopAndDestroy( switchBuffer );
 switchBuffer = NULL;
 }
+	iDefaultIconSet = ETrue;
-	if ( iIsNowPlayingView )
-	    {
-iDefaultIconSet = EFalse;
-iIsNowPlayingView = EFalse;
-	    }
-	else
-	    {
-iDefaultIconSet = ETrue;
-	    }
 	CleanPrevView();
 }
 // ----------------------------------------------------------------------------
 // Add shuffle list item to the top of the list.
 }
 else if ( !ShufflePlayAllL(index) )
 {
 // To open the selected album.
 iView->ProcessCommandL( EMPXCmdCommonEnterKey );
-iPlaybackUtility->SetL( EPbPropertyRandomMode, EFalse );
 }
 		// Disable transition in reorder mode
 if( !inReorderMode )
 {
 					cpath->Set(randIndex);
 					iPlaybackUtility->SetL( EPbPropertyRandomMode, ETrue );
 					}
 				else
 					{
-					iPlaybackUtility->SetL( EPbPropertyRandomMode, EFalse );
 					cpath->Set(aIndex-1); // actual selection
 					}
 				}
 			else
 				{
-				iPlaybackUtility->SetL( EPbPropertyRandomMode, EFalse );
 				cpath->Set(aIndex);
 				}
 			}
 		MPX_DEBUG_PATH(*cpath);
 // Start animation now as next view activated is
 // now playing view. We will end animation in now playing view.
 SetupTransitionType(KMPXInterviewTransition);
 BeginFullScreenAnimation();
 }
-else if( !iLayoutSwitch && iMediaWall && ( iCurrentViewType == EMPXViewMediawall ) )
+else if( !iLayoutSwitch && iMediaWall )
 {
 // Close mediawall "flip animation"
 iMediaWall->StartOpeningAnimationL( EFalse );
 }
 	if( songCount > 1 )
 		{
 		listSize++;
 		indexAddition = 1;
 		}
-	currentList->Reset(); //clears any selection along with list reset
 	// Add space for shuffle item if list contains more than one item.
 	currentList->ResizeL( listSize );
 	for ( TInt i = 0; i < songCount ; i++ )
 		{

branch	RCL_3
changeset 66	1f1dad4af8f8
parent 60	bdd9da0d70fe