mpxplugins/viewplugins/views/collectionviewhg/src/mpxcollectionviewhgcontainer.cpp
--- a/mpxplugins/viewplugins/views/collectionviewhg/src/mpxcollectionviewhgcontainer.cpp Wed Sep 01 12:32:02 2010 +0100
+++ b/mpxplugins/viewplugins/views/collectionviewhg/src/mpxcollectionviewhgcontainer.cpp Tue Sep 14 21:14:08 2010 +0300
@@ -801,8 +801,15 @@
SetRect( clientRect );
iBgContext->SetRect(((CAknAppUi*)iCoeEnv->AppUi())->ApplicationRect());
- // call HandleLbxItemAdditionL
- HandleLbxItemAdditionL();
+ if ( iCurrentViewType == EMPXViewMediawall )
+ {
+ PrepareTboneViewL();
+ }
+ else
+ {
+ // call HandleLbxItemAdditionL
+ HandleLbxItemAdditionL();
+ }
}
);
if(iMediaWall)
@@ -1304,11 +1311,6 @@
{
RestoreSelectedAlbumItemL(mediaArray);
PrepareMediaWallWithListL( mediaArray, count );
- // We need to adjust the CBA for this view.
- if( iCbaHandler )
- {
- iCbaHandler->UpdateCba();
- }
break;
}
case EMPXViewList:
@@ -1726,7 +1728,10 @@
((CAknAppUi*)iCoeEnv->AppUi())->StatusPane()->MakeVisible(EFalse);
iThumbnailManager->SetSizeL( EAudioGridThumbnailSize );
-
+ if( iCbaHandler )
+ {
+ iCbaHandler->UpdateCba();
+ }
TRect clientRect = ((CAknView*)iView)->ClientRect();
TAknLayoutRect mediawallLayout;
@@ -4729,7 +4734,7 @@
SetupTransitionType(KMPXInterviewTransition);
BeginFullScreenAnimation();
}
- else if( !iLayoutSwitch && iMediaWall )
+ else if( !iLayoutSwitch && iMediaWall && ( iCurrentViewType == EMPXViewMediawall ) )
{
// Close mediawall "flip animation"
iMediaWall->StartOpeningAnimationL( EFalse );
@@ -4765,6 +4770,7 @@
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 );