FCL/sf/app/homescreen: comparison idlehomescreen/xmluirendering/renderingplugins/xnanimationfactory/src/xnanimationadapter.cpp

equal deleted inserted replaced

-:4d54b72983ae
+:c743ef5928ba
 #include "xnproperty.h"
 #include "xncontroladapter.h"
 #include "xnanimationadapter.h"
-const TInt KPeriodicTimerInterval5Sec(100000); // 0.1 sec
 // ============================ MEMBER FUNCTIONS ===============================
 // -----------------------------------------------------------------------------
 // CXnAnimationAdapter::NewL
 // Symbian static 1st phase constructor
 //
 void CXnAnimationAdapter::ConstructL(CXnNodePluginIf& aNode)
 {
 CXnControlAdapter::ConstructL( aNode );
 iSkinId = KAknsIIDNone;
-iAnimationSarted = EFalse;
 }
 // -----------------------------------------------------------------------------
 // CXnAnimationAdapter::CXnAnimationAdapter
 // C++ default constructor
 // C++ destructor
 // -----------------------------------------------------------------------------
 //
 CXnAnimationAdapter::~CXnAnimationAdapter()
 {
-if (iPeriodicTimer)
+StopAnimation();
-{
-iPeriodicTimer->Cancel();
-delete iPeriodicTimer;
-iPeriodicTimer = NULL;
-}
 }
 // -----------------------------------------------------------------------------
 // CXnAnimationAdapter::Draw
 {
 const TDesC8& display( aProperty->StringValue() );
 if( display == XnPropertyNames::style::common::display::KBlock )
 {
-iDisplay = ETrue;
 StartAnimation();
 }
 else
 {
-iDisplay = EFalse;
 StopAnimation();
 }
 }
 }
 }
 // CXnNewstickerAdapter::MakeVisible()
 // -----------------------------------------------------------------------------
 //
 void CXnAnimationAdapter::MakeVisible( TBool aVisible )
 {
-if( aVisible )
+TBool visible( IsVisible() ? ETrue : EFalse );
+if ( visible == aVisible ) { return; }
+CCoeControl::MakeVisible( aVisible );
+if ( aVisible )
 {
 StartAnimation();
 }
 else
 {
 StopAnimation();
 }
-CCoeControl::MakeVisible( aVisible );
 }
 // -----------------------------------------------------------------------------
 // CXnAnimationAdapter::Update
 // -----------------------------------------------------------------------------
 //
 void CXnAnimationAdapter::Update()
 {
-if (iAnimationSarted )
+if ( iPeriodicTimer && iPeriodicTimer->IsActive() )
 {
-switch(iSkinId.iMinor )
+switch( iSkinId.iMinor )
 {
 case EAknsMinorGenericQgnHomeRefreshing1:
 {
 iSkinId.Set(KAknsIIDQgnHomeRefreshing2);
 }
 //
 TInt CXnAnimationAdapter::TimerCallBack(TAny* aAny)
 {
 CXnAnimationAdapter* self = static_cast<CXnAnimationAdapter*> (aAny);
-// Update widget every 5 seconds
+// Update widget
 self->Update();
 return KErrNone; // Return value ignored by CPeriodic
 }
 // CXnAnimationAdapter::StartAnimation()
 // ----------------------------------------------------------------------------
 //
 void CXnAnimationAdapter::StartAnimation()
 {
-if ( !iAnimationSarted && iDisplay )
+if ( !iPeriodicTimer && IsVisible() )
 {
 TRAPD(err, iPeriodicTimer = CPeriodic::NewL(CActive::EPriorityIdle) );
 if ( err == KErrNone )
 {
-iPeriodicTimer->Start( KPeriodicTimerInterval5Sec,
+		   const TInt KPeriodicTimerInterval = 100000; // 0.1 sec
-KPeriodicTimerInterval5Sec, TCallBack( TimerCallBack, this ) );
+iPeriodicTimer->Start( KPeriodicTimerInterval,
+KPeriodicTimerInterval, TCallBack( TimerCallBack, this ) );
 iSkinId = KAknsIIDQgnHomeRefreshing1;
-iAnimationSarted = ETrue;
 }
 }
 }
 // ----------------------------------------------------------------------------
 // CXnAnimationAdapter::StopAnimation()
 // ----------------------------------------------------------------------------
 //
 void CXnAnimationAdapter::StopAnimation()
 {
-if ( iAnimationSarted )
+if ( iPeriodicTimer && iPeriodicTimer->IsActive() )
 {
 iPeriodicTimer->Cancel();
-delete iPeriodicTimer;
+}
-iPeriodicTimer = NULL;
+delete iPeriodicTimer;
-iSkinId = KAknsIIDNone;
+iPeriodicTimer = NULL;
-iAnimationSarted = EFalse;
+iSkinId = KAknsIIDNone;
-}
 }
 // End of File

changeset 5	c743ef5928ba
parent 4	4d54b72983ae
child 9	f966699dea19