MCL/sf/app/homescreen: comparison idlehomescreen/xmluirendering/uiengine/src/xnviewmanager.cpp

equal deleted inserted replaced

-:ff572dfe6d86
+:9674c1a575e9
 #include <StringLoader.h>
 #include <xnuiengine.rsg>
 #include <aknnotewrappers.h>
 #include <AknsConstants.h>
 #include <aifwdefs.h>
+#include <gfxtranseffect/gfxtranseffect.h>
+#include <akntransitionutils.h>
 // User includes
 #include "xnapplication.h"
 #include "xnuiengine.h"
 #include "xnproperty.h"
 // Constants
 _LIT8( KEmptyWidgetUid, "0x2001f47f" );
 _LIT8( KTemplateViewUID, "0x20026f50" );
-const TInt KPSCategoryUid = 0x200286E3;
+const TInt KPSCategoryUid( 0x200286E3 );
-const TInt KPSCrashCountKey = 1;
+const TInt KPSCrashCountKey( 1 );
-const TInt KStabilityInterval = 60000000; // 1 minute
+const TInt KStabilityInterval( 60000000 ); // 1 minute
-const TInt KCrashRestoreThreshold = 3;
+const TInt KCrashRestoreThreshold( 3 );
 // ============================ LOCAL FUNCTIONS ===============================
 // -----------------------------------------------------------------------------
 // BuildTriggerL
 // Builds a trigger node
 //
 CXnViewManager::~CXnViewManager()
 {
 delete iUiStartupPhase;
-if( iStabilityTimer )
+delete iStabilityTimer;
-{
-iStabilityTimer->Cancel();
-delete iStabilityTimer;
-iStabilityTimer = NULL;
-}
 iObservers.Reset();
 delete iRootData;
 //
 void CXnViewManager::PropertyChangedL( const TUint32 aKey, const TInt aValue )
 {
 if ( aKey == KPSStartupUiPhase && aValue == EStartupUiPhaseAllDone )
 {
-if ( iRootData )
+	    iUiStartupPhaseAllDone = ETrue;
-{
-iRootData->LoadRemainingViews();
+iAppUiAdapter.ViewAdapter().ActivateContainerL( ActiveViewData() );
 }
-}
-}
+iUiStartupPhaseAllDone = ETrue;
+}
+// -----------------------------------------------------------------------------
+// CXnViewManager::UiStartupPhaseAllDone()
+//
+// -----------------------------------------------------------------------------
+//
+TBool CXnViewManager::UiStartupPhaseAllDone() const
+{
+return iUiStartupPhaseAllDone;
+}
 // -----------------------------------------------------------------------------
 // CXnViewManager::ConstructL()
 // 2nd phase constructor
 // -----------------------------------------------------------------------------
 //
 // Robustness checks.
 TInt crashCount = 0;
 RProperty::Get( TUid::Uid( KPSCategoryUid ),
 KPSCrashCountKey,
 crashCount );
 if( crashCount >= KCrashRestoreThreshold )
 {
 iHspsWrapper->RestoreRootL();
 ResetCrashCount();
 ShowErrorNoteL( R_QTN_HS_ERROR_WIDGETS_REMOVED );
 // then crash count is reset to 0.
 iStabilityTimer = CPeriodic::NewL( CActive::EPriorityStandard );
 iStabilityTimer->Start( KStabilityInterval,
 KStabilityInterval,
 TCallBack( SystemStabileTimerCallback, this ) );
 }
 }
 // -----------------------------------------------------------------------------
 // CXnViewManager::LoadUiL()
 // Loads the application UI and initial view
 CleanupStack::PopAndDestroy(); // DisableRenderUiLC();
 // Determine UI startup phase
 delete iUiStartupPhase;
 iUiStartupPhase = NULL;
+iUiStartupPhaseAllDone = EFalse;
 iUiStartupPhase = CXnPropertySubscriber::NewL(
 KPSUidStartup, KPSStartupUiPhase, *this );
 }
 //
 CXnViewData& CXnViewManager::NextViewData() const
 {
 return iRootData->NextViewData();
 }
 // -----------------------------------------------------------------------------
 // CXnViewManager::ActivateNextViewL()
 // Activates the next view
 // -----------------------------------------------------------------------------
 //
-void CXnViewManager::ActivateNextViewL( TInt aEffectId )
+void CXnViewManager::ActivateNextViewL( TInt /*aEffectId*/ )
 {
 CXnViewData& next( NextViewData() );
 if ( !next.Occupied() )
 {
 if ( next.Load() == KErrNoMemory )
 {
 next.ShowOutOfMemError();
+return;
 }
 }
 // Activate view
 if ( next.Occupied() && !next.Active() )
 {
-if( aEffectId )
+CXnControlAdapter* thisView(
-{
+ActiveViewData().ViewNode()->Control() );
-iUiEngine->AppUiAdapter().EffectManager()->BeginFullscreenEffectL(
-aEffectId, iUiEngine->ViewManager()->ActiveViewData() );
+CXnControlAdapter* nextView(
-}
+next.ViewNode()->Control() );
-iAppUiAdapter.ViewAdapter().ActivateContainerL( next );
+GfxTransEffect::Register( thisView, KGfxContextActivateNextView );
+GfxTransEffect::Register( nextView, KGfxContextActivateNextView );
+TInt ret( GfxTransEffect::BeginGroup() );
+CCoeControl* bg( &iAppUiAdapter.ViewAdapter().BgManager() );
+GfxTransEffect::Begin( bg, KGfxControlActionAppear );
+GfxTransEffect::SetDemarcation( bg, bg->Position() );
+GfxTransEffect::End( bg );
+GfxTransEffect::Begin( thisView, KGfxControlActionDisappear );
+iAppUiAdapter.ViewAdapter().ActivateContainerL( next );
+GfxTransEffect::SetDemarcation( thisView, thisView->Position() );
+GfxTransEffect::End( thisView );
+GfxTransEffect::Begin( nextView, KGfxControlActionAppear );
+GfxTransEffect::SetDemarcation( nextView, nextView->Position() );
+GfxTransEffect::End( nextView );
+GfxTransEffect::EndGroup( ret );
+GfxTransEffect::Deregister( thisView );
+GfxTransEffect::Deregister( nextView );
 }
 }
 // -----------------------------------------------------------------------------
 // CXnViewManager::ActivatePreviousViewL()
 // Activates the previous view
 // -----------------------------------------------------------------------------
 //
-void CXnViewManager::ActivatePreviousViewL( TInt aEffectId )
+void CXnViewManager::ActivatePreviousViewL( TInt /*aEffectId*/ )
 {
 CXnViewData& prev( PreviousViewData() );
 if ( !prev.Occupied() )
 {
 if ( prev.Load() == KErrNoMemory )
 {
 prev.ShowOutOfMemError();
+return;
 }
 }
 // Activate view
 if ( prev.Occupied() && !prev.Active() )
 {
-if( aEffectId  )
+CXnControlAdapter* thisView(
-{
+ActiveViewData().ViewNode()->Control() );
-iUiEngine->AppUiAdapter().EffectManager()->BeginFullscreenEffectL(
-aEffectId, iUiEngine->ViewManager()->ActiveViewData() );
+CXnControlAdapter* prevView(
-}
+prev.ViewNode()->Control() );
+GfxTransEffect::Register( thisView, KGfxContextActivatePrevView );
+GfxTransEffect::Register( prevView, KGfxContextActivatePrevView );
+TInt ret( GfxTransEffect::BeginGroup() );
+CCoeControl* bg( &iAppUiAdapter.ViewAdapter().BgManager() );
+GfxTransEffect::Begin( bg, KGfxControlActionAppear );
+GfxTransEffect::SetDemarcation( bg, bg->Position() );
+GfxTransEffect::End( bg );
+GfxTransEffect::Begin( thisView, KGfxControlActionDisappear );
 iAppUiAdapter.ViewAdapter().ActivateContainerL( prev );
+GfxTransEffect::SetDemarcation( thisView, thisView->Position() );
+GfxTransEffect::End( thisView );
+GfxTransEffect::Begin( prevView, KGfxControlActionAppear );
+GfxTransEffect::SetDemarcation( prevView, prevView->Position() );
+GfxTransEffect::End( prevView );
+GfxTransEffect::EndGroup( ret );
+GfxTransEffect::Deregister( thisView );
+GfxTransEffect::Deregister( prevView );
 }
 }
 // -----------------------------------------------------------------------------
 // CXnViewManager::AddViewL()
 if ( newView->Occupied() )
 {
 // Start transition effect
 if( aEffectId )
 {
-iUiEngine->AppUiAdapter().EffectManager()->BeginFullscreenEffectL(
+iAppUiAdapter.EffectManager()->BeginFullscreenEffectL(
-aEffectId, iUiEngine->ViewManager()->ActiveViewData() );
+aEffectId, ActiveViewData() );
 }
 // Load succeed, add the new view behind the current view
 RPointerArray< CXnPluginData >& views( iRootData->PluginData() );
 if ( query->RunLD() )
 {
 // Start transition effect
 if( aEffectId )
 {
-iUiEngine->AppUiAdapter().EffectManager()->BeginFullscreenEffectL(
+iAppUiAdapter.EffectManager()->BeginFullscreenEffectL(
-aEffectId, iUiEngine->ViewManager()->ActiveViewData() );
+aEffectId, ActiveViewData() );
 }
 // Activate the next view, or first if in the last view
 CXnViewData& next( NextViewData() );
 // CXnViewManager::NotifyContainerChangedL()
 // Notifies container is changed, this is called always by CXnViewAdapter
 // -----------------------------------------------------------------------------
 void CXnViewManager::NotifyContainerChangedL( CXnViewData& aViewToActivate )
 {
-#ifdef _XN_PERFORMANCE_TEST_
-RDebug::Print( _L( "CXnViewManager::NotifyContainerChangedL - start" ) );
-#endif //_XN_PERFORMANCE_TEST_
 CXnViewData& viewToDeactivate( ActiveViewData() );
 if ( &aViewToActivate != &viewToDeactivate )
 {
 NotifyViewDeactivatedL( viewToDeactivate );
 viewToDeactivate.SetActive( EFalse );
 aViewToActivate.SetActive( ETrue );
 iHspsWrapper->SetActivePluginL( aViewToActivate.PluginId() );
 // Cache update is needed after view activation
 UpdateCachesL();
-UpdateWallpaperL( viewToDeactivate, aViewToActivate );
 }
 else
 {
 // Activate first view
 aViewToActivate.SetActive( ETrue );
 // Cache update is needed after view activation
 UpdateCachesL();
+// Schedule remaining views loading
+iRootData->LoadRemainingViews();
 }
 NotifyViewActivatedL( aViewToActivate );
 UpdatePageManagementInformationL();
-#ifdef _XN_PERFORMANCE_TEST_
-RDebug::Print( _L( "CXnViewManager::NotifyContainerChangedL - end" ) );
-#endif //_XN_PERFORMANCE_TEST_
 }
 // -----------------------------------------------------------------------------
 // CXnViewManager::NotifyViewActivatedL()
 // Notifies view is activated
 ->SetStringValueL( CXnDomPropertyValue::EString, value );
 }
 }
 node->ReportXuikonEventL( *iWidgetAmountTrigger );
-}
-// -----------------------------------------------------------------------------
-// CXnViewManager::UpdateWallpaperL
-// -----------------------------------------------------------------------------
-//
-void CXnViewManager::UpdateWallpaperL( CXnViewData& aCurrent, CXnViewData& aNew )
-{
-iAppUiAdapter.ViewAdapter().BgManager().WallpaperChanged( aCurrent, aNew );
 }
 // -----------------------------------------------------------------------------
 // CXnViewManager::ShowOperationFailedMessageL
 // -----------------------------------------------------------------------------

branch	RCL_3
changeset 12	9674c1a575e9
parent 11	ff572dfe6d86
child 17	b8fae6b8a148