diff -r b023a8d2866a -r ea65f74e6de4 photosgallery/viewframework/views/viewbase/src/glxviewbase.cpp --- a/photosgallery/viewframework/views/viewbase/src/glxviewbase.cpp Thu Jul 15 18:39:01 2010 +0300 +++ b/photosgallery/viewframework/views/viewbase/src/glxviewbase.cpp Thu Aug 19 09:55:03 2010 +0300 @@ -43,6 +43,9 @@ #include // for getting the button state +// For transition effects +#include + _LIT(KGlxViewBaseResource, "glxviewbase.rsc"); /// Length of time a view-switch animation should take @@ -54,6 +57,7 @@ // EXPORT_C CGlxViewBase::CGlxViewBase(TBool aSyncActivation) : iViewAnimationTime(KGlxViewSwitchAnimationDuration), + iIsTransEffectStarted(EFalse), iViewAnimationInProgress(EGlxViewAnimationNone), iSyncActivation(aSyncActivation) { @@ -156,6 +160,8 @@ { if ( EAknSoftkeyBack == aCommand ) { + // Pass it to view + DoHandleCommandL(aCommand); iUiUtility->SetViewNavigationDirection(EGlxNavigationBackwards); } else if ( EAknCmdOpen == aCommand ) @@ -708,6 +714,14 @@ iCommandHandlerList[i]->ActivateL(Id().iUid); i++; } + + //Check if transition effect is already started. + //Calling the 'EndFullScreen()' actually starts the FS transition effect. + if(iIsTransEffectStarted) + { + GfxTransEffect::EndFullScreen(); + iIsTransEffectStarted = EFalse; + } InitAnimationL(EGlxViewAnimationEntry); }