diff -r c52421ed5f07 -r a1caeb42b3a3 uifw/EikStd/dlgsrc/aknformphysics.cpp --- a/uifw/EikStd/dlgsrc/aknformphysics.cpp Mon Jun 21 15:57:43 2010 +0300 +++ b/uifw/EikStd/dlgsrc/aknformphysics.cpp Thu Jul 15 18:56:19 2010 +0300 @@ -115,16 +115,11 @@ const TTime& aStartTime ) { _AKNTRACE_FUNC_ENTER; - if ( PhysicsAllowed() ) + TPoint drag( aLength ); + + if ( iPhysics->StartPhysics( drag, aStartTime ) ) { - TPoint drag( aLength ); - if ( iPhysics->StartPhysics( drag, aStartTime ) ) - { - // reset benchmark variables - iStartTime.HomeTime(); - iFrameCount = 0; - return ETrue; - } + return ETrue; } PhysicEmulationEnded(); @@ -170,7 +165,7 @@ void CAknFormPhysics::SetPanningPosition( const TPoint& aDelta ) { _AKNTRACE_FUNC_ENTER; - if ( PhysicsAllowed() && iPhysics ) + if ( iPhysics ) { iPhysics->RegisterPanningPosition( aDelta ); } @@ -189,32 +184,9 @@ _AKNTRACE_FUNC_ENTER; _AKNTRACE( "The Position of aNewPosition are: ( %d, %d ) ", aNewPosition.iX, aNewPosition.iY ); - if ( !PhysicsAllowed() ) - { - return; - } - TInt fps = 0; + iViewCenter = aNewPosition; - - // benchmark / debug part - if ( iFrameCount != -1 ) - { - ++iFrameCount; - TTime now; - now.HomeTime(); - - TInt64 duration = now.MicroSecondsFrom( iStartTime ).Int64(); - - if ( duration > 0 ) - { - fps = iFrameCount * 1000000 / duration; - } - } - - TBuf<128> msg; - msg.Format( _L( "%dfps" ), fps ); - - iParent.ScrollCacheByPixels( iViewCenter.iY, msg, aDrawNow ); + iParent.ScrollCacheByPixels( iViewCenter.iY, aDrawNow ); _AKNTRACE_FUNC_EXIT; } @@ -227,7 +199,6 @@ { _AKNTRACE_FUNC_ENTER; iParent.Synchronize(); - iFrameCount = -1; _AKNTRACE_FUNC_EXIT; } @@ -300,13 +271,4 @@ { return iViewCenter; } - - -// --------------------------------------------------------------------------- -// CAknFormPhysics::PhysicsAllowed -// --------------------------------------------------------------------------- -// -TBool CAknFormPhysics::PhysicsAllowed() const - { - return ETrue; - } +