--- a/menufw/menufwui/matrixmenu/src/mmappui.cpp Tue Feb 02 00:04:13 2010 +0200
+++ b/menufw/menufwui/matrixmenu/src/mmappui.cpp Fri Feb 19 22:42:37 2010 +0200
@@ -12,8 +12,8 @@
* Contributors:
*
* Description: Application UI class
-* Version : %version: MM_176.1.28.1.61 % << Don't touch! Updated by Synergy at check-out.
-* Version : %version: MM_176.1.28.1.61 % << Don't touch! Updated by Synergy at check-out.
+* Version : %version: MM_176.1.28.1.65 % << Don't touch! Updated by Synergy at check-out.
+* Version : %version: MM_176.1.28.1.65 % << Don't touch! Updated by Synergy at check-out.
*
*/
@@ -611,7 +611,7 @@
GfxTransEffect::BeginFullScreen(
effect, rect,
AknTransEffect::EParameterType,
- AknTransEffect::GfxTransParam( appUid ) );
+ AknTransEffect::GfxTransParam( appUid , KUidMatrixMenuApp ) );
}
}
@@ -1131,14 +1131,6 @@
iCurrentContainer->HandleItemRemovalL();
iCurrentContainer->CancelDragL( EFalse );
- if( typeCurr == EItemTypeParentFolder )
- {
- StartLayoutSwitchFullScreen( EMenuCloseFolderEffect );
- }
- else
- {
- StartLayoutSwitchFullScreen( EMenuOpenFolderEffect );
- }
iHNInterface->TriggerHnEventL( KKeyIdMoveInto, itemId, eventParameters );
iMakeHightlightedItemFullyVisible = ETrue;
}
@@ -2833,6 +2825,10 @@
paramList->AppendL(command);
HandleRequestL(*paramList);
CleanupStack::PopAndDestroy(paramList);
+ if( iCurrentContainer )
+ {
+ iCurrentContainer->HandleResourceChange( KAknsMessageSkinChange );
+ }
}
// ---------------------------------------------------------------------------
@@ -2957,7 +2953,7 @@
}
if( IsEditMode() && iCurrentContainer->IsDraggable() )
{
- iCurrentContainer->CancelDragL( EFalse );
+ HandleDragStopL( iCurrentContainer->GetHighlight() );
iCurrentContainer->DrawNow();
}
iCurrentContainer->SetHasFocusL( EFalse );
@@ -2990,6 +2986,7 @@
if (skinInstance && !skinInstance->IsUpdateInProgress())
{
RefreshIconsL();
+
}
}
}