MCL/sf/app/homescreen: comparison taskswitcher/taskswitcherui/taskswitcherapp/src/tsfastswaparea.cpp

equal deleted inserted replaced

-:ff572dfe6d86
+:9674c1a575e9
 const TInt KRedrawTime = 250000; // 0.25 sec
 const TInt KRedrawTimeForLayoutSwitch = 700000; // 0.7 sec
 const TInt KHighlighActivationTime = 100000; // 100 ms
 const TInt KUpdateGridTime = 0; // imediately
+const TInt KOrientationSwitchTime = 1000000; // 1 sec
 const TInt KMaxGranularity = 4;
 // -----------------------------------------------------------------------------
 // CTsFastSwapArea::NewL
 //
 CTsFastSwapArea::CTsFastSwapArea(CCoeControl& aParent,
 CTsDeviceState& aDeviceState,
 CTsEventControler& aEventHandler) :
 iParent(aParent), iDeviceState(aDeviceState), iEvtHandler(aEventHandler),
-iPreviousNoOfItems(0)
+iPreviousNoOfItems(0), iIgnoreLayoutSwitch(EFalse)
 {
 // no implementation required
 }
 // -----------------------------------------------------------------------------
 delete iFSClient;
 delete iPopup;
 delete iHighlightTimer;
 delete iRedrawTimer;
 delete iUpdateGridTimer;
+delete iOrientationSignalTimer;
 }
 // -----------------------------------------------------------------------------
 // CTsFastSwapArea::ConstructL
 // -----------------------------------------------------------------------------
 iRedrawTimer = new (ELeave) CTsFastSwapTimer( *this );
 iRedrawTimer->ConstructL();
 iUpdateGridTimer = new (ELeave) CTsFastSwapTimer( *this );
 iUpdateGridTimer->ConstructL();
+iOrientationSignalTimer = new (ELeave) CTsFastSwapTimer( *this );
+iOrientationSignalTimer->ConstructL();
 ActivateL();
 }
 // -----------------------------------------------------------------------------
 void CTsFastSwapArea::SizeChanged()
 {
 TSLOG_CONTEXT( CTsFastSwapArea::SizeChanged, TSLOG_LOCAL );
 TSLOG_IN();
-if ( iGrid )
+if ( iGrid && !iIgnoreLayoutSwitch )
 {
 // Grid needs to be recreated to proper reinitilize
 // data with new layout values
 TInt selIdx = SelectedIndex();
 TRAPD(err,
 ReCreateGridL();
-iEvtHandler.ReInitPhysicsL(GridWorldSize(), ViewSize(), ETrue););
+/*iEvtHandler.ReInitPhysicsL(GridWorldSize(), ViewSize(), ETrue);*/);
 if ( err != KErrNone )
 {
 TSLOG1( TSLOG_INFO, "ReCreateGridL leaves with %d", err );
 }
 HandleFswContentChanged();
 TInt wgId = iArray[aIndex]->WgId();
 // Move other app to foreground and then move ourselves to background.
 // Order is important and cannot be reversed.
 iFSClient->SwitchToApp( wgId );
 // We do not want to come back to ts if the activated app is closed.
-// Therefore ts must be moved to background.
+// Therefore ts must be moved to background. Ignore orientation updates, it
+// will be done after task switcher is sent to background
+iIgnoreLayoutSwitch = ETrue;
 CTsAppUi* appui =
 static_cast<CTsAppUi*>( iEikonEnv->AppUi() );
 appui->MoveAppToBackground( CTsAppUi::EActivationTransition );
+iIgnoreLayoutSwitch = EFalse;
+// Orientation update
+iPrevScreenOrientation = -1; // force orientation reinit
+iOrientationSignalTimer->Cancel();
+iOrientationSignalTimer->After(KOrientationSwitchTime);
 }
 }
 // --------------------------------------------------------------------------
 // CTsFastSwapArea::TryCloseAppL
 else
 {
 DrawDeferred();
 iGrid->SetCurrentDataIndex(selIdx);
 }
+// Orientation update
+iPrevScreenOrientation = GetCurrentScreenOrientation();
+iOrientationSignalTimer->Cancel();
+iOrientationSignalTimer->After(KOrientationSwitchTime);
 }
 TSLOG_OUT();
 }
 }
 else if( aSource == iUpdateGridTimer )
 {
 UpdateGrid(ETrue, ETrue);
 }
+else if ( aSource == iOrientationSignalTimer )
+{
+TInt currentOrientation = GetCurrentScreenOrientation();
+if ( currentOrientation != iPrevScreenOrientation )
+{
+// Order layout change
+static_cast<CAknAppUi*>(iCoeEnv->AppUi())->HandleResourceChangeL(KEikDynamicLayoutVariantSwitch);
+iRedrawTimer->Cancel();
+iRedrawTimer->After(KRedrawTime);
+}
+}
 }
 // -----------------------------------------------------------------------------
 // CTsFastSwapArea::PreCreatePopupL
 TPoint targetPoint = ItemViewPosition( SelectedIndex() );
 if ( aForceRedraw || targetPoint.iX != ViewPos().iX )
 {
 if ( aAnimate )
 {
-			iIgnorePhysicsMove = EFalse;
 iEvtHandler.Animate( targetPoint );
 }
 else
 {
-MoveOffset(targetPoint);
+MoveOffset(targetPoint, ETrue);
 iEvtHandler.StopAnimation();
 }
 if ( aForceRedraw )
 {
 iGrid->DrawNow();
 // --------------------------------------------------------------------------
 // CTsFastSwapArea::MoveOffset
 // --------------------------------------------------------------------------
 //
-void CTsFastSwapArea::MoveOffset(const TPoint& aPoint)
+void CTsFastSwapArea::MoveOffset(const TPoint& aPoint, TBool aDrawNow)
 {
 TSLOG_CONTEXT( CTsFastSwapArea::MoveOffset, TSLOG_LOCAL );
 TSLOG2_IN("Old position x: %d, y:%d", ViewPos().iX, ViewPos().iY);
 TSLOG2_IN("New position x: %d, y:%d", aPoint.iX, aPoint.iY);
 TSLOG_OUT();
-//ignore case when drag occurs outside owned area
-if( iIgnorePhysicsMove )
-	{
-		return;
-	}
 //postpone center item request in case of being moved
 if(iUpdateGridTimer->IsActive())
 	{
 	iUpdateGridTimer->Cancel();
 		iUpdateGridTimer->After(KUpdateGridTime);
 	}
-TInt currentXPos = aPoint.iX;
+if ( aDrawNow )
-currentXPos -= Rect().Width() / 2;
+{
-TRect gridViewRect = Rect();
+TInt currentXPos = aPoint.iX;
-gridViewRect.iTl.iX = -currentXPos;
+currentXPos -= Rect().Width() / 2;
-// Take edge offset into account
+TRect gridViewRect = Rect();
-gridViewRect.iTl.iX += Rect().iTl.iX;
+gridViewRect.iTl.iX = -currentXPos;
-if(GridItemCount() <= iMaxItemsOnScreen)
+// Take edge offset into account
-{
+gridViewRect.iTl.iX += Rect().iTl.iX;
-// Center view
+if(GridItemCount() <= iMaxItemsOnScreen)
-gridViewRect.iTl.iX += ( Rect().Width() - GridItemCount() * iGridItemWidth ) / 2;
+{
-}
+// Center view
-iGrid->SetRect( gridViewRect );
+gridViewRect.iTl.iX += ( Rect().Width() - GridItemCount() * iGridItemWidth ) / 2;
-DrawDeferred();
+}
+iGrid->SetRect( gridViewRect );
+DrawDeferred();
+iLogicalViewPosOffset = 0;
+}
+else
+{
+// Update logical view position
+iLogicalViewPosOffset = aPoint.iX - ViewPos().iX;
+}
 }
 // --------------------------------------------------------------------------
 // CTsFastSwapArea::Tap
 // --------------------------------------------------------------------------
 const MAknTouchGestureFwDragEvent& aEvent)
 {
 	if( aEvent.State() == EAknTouchGestureFwStop)
 		{
 		CenterItem( KUpdateGridTime );
-		}
-	if( !Rect().Contains(aEvent.CurrentPosition()) )
-		{
-		iIgnorePhysicsMove = ETrue;
-		return;
-		}
-	else
-		{
-		iIgnorePhysicsMove = EFalse;
 		}
 iGrid->SetTactileFeedbackSupport(ETrue);
 iGrid->HideHighlight();
 }
 if( gridItemCount <= iMaxItemsOnScreen)
 {
 // View centered
 retVal.iX += ( Rect().Width() - gridItemCount * iGridItemWidth ) / 2;
 }
+retVal.iX += iLogicalViewPosOffset;
 return retVal;
 }
 // -----------------------------------------------------------------------------
 // CTsFastSwapArea::ItemPosition
 TRAP_IGNORE( scrollBar->SetScrollBarVisibilityL(CEikScrollBarFrame::EOff,
 CEikScrollBarFrame::EOff));
 }
 }
+// -----------------------------------------------------------------------------
+// CTsFastSwapArea::GetCurrentScreenOrientation
+// -----------------------------------------------------------------------------
+//
+TInt CTsFastSwapArea::GetCurrentScreenOrientation()
+{
+TPixelsAndRotation availableRect;
+iEikonEnv->ScreenDevice()->GetDefaultScreenSizeAndRotation(availableRect);
+return availableRect.iPixelSize.iWidth > availableRect.iPixelSize.iHeight;
+}
 // End of file

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