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

equal deleted inserted replaced

-:c743ef5928ba
+:f966699dea19
 #include <AknIconUtils.h>
 #include <AknIconArray.h>
 #include <aknstyluspopupmenu.h>
 #include <AknQueryDialog.h>
 #include <StringLoader.h>
-#include <tstaskswitcher.rsg>
+#include <taskswitcher.rsg>
 #include <aknlayoutscalable_apps.cdl.h>
 #include <layoutmetadata.cdl.h>
 #include <aknlists.h>
 #include <touchfeedback.h>
 #include <akntransitionutils.h>
 #include "tsapplogging.h"
 #include "tsfswclient.h"
 #include "tsappui.h"
 #include "tsdatachangeobserver.h"
 #include "tseventcontroler.h"
+#include "tsappview.h"
 /** command ids for the fsw popup */
 enum TPopupCommands
 {
 EFswCmdClose = 10000,
 };
 /** Number of closable applications, to show "close all" option. */
 const TInt KTsMaxClosableApps = 2;
-/** Interval until which no change in the fsw content is rendered
-after starting the closing of an application. */
-const TInt KRefreshDelayAfterClose = 2; // seconds
 /** Uid of Active Idle application.
 Used when movind Ai to specified position.*/
 const TUid KAiUid = TUid::Uid( 0x102750F0 );
 /** Position of Ai in fsw grid.*/
 const TInt KAppKeyTypeLong = 2;
 const TInt KLayoutItemCount = 4;
 const TInt KRedrawTime = 250000; // 0.25 sec
+const TInt KRedrawTimeForLayoutSwitch = 700000; // 0.7 sec
 const TInt KHighlighActivationTime = 100000; // 100 ms
 const TInt KUpdateGridTime = 1000000; // 1 s
+const TInt KMaxGranularity = 4;
 // -----------------------------------------------------------------------------
 // CTsFastSwapArea::NewL
 // -----------------------------------------------------------------------------
 //
 iGrid = NULL;
 }
 iGrid = new( ELeave ) CTsFastSwapGrid;
 iGrid->ConstructL( this );
+	iGrid->DisableSingleClick(ETrue);//enables highlight on pointer
 iDeviceState.AddObserverL(*iGrid, MTsDeviceStateObserver::ESkin);
 AknListBoxLayouts::SetupStandardGrid( *iGrid );
 RArray<TAknLayoutRect> rects;
 TAknLayoutRect gridNextItem = rects[3];
 CleanupStack::PopAndDestroy(&rects);
 TInt variety = Layout_Meta_Data::IsLandscapeOrientation() ? 1 : 0;
 iGrid->SetRect(gridAppPane.Rect());
-iGrid->SetVisibleViewRect(gridAppPane.Rect());
 TAknLayoutScalableParameterLimits gridParams =
 AknLayoutScalable_Apps::cell_tport_appsw_pane_ParamLimits( variety );
 TPoint empty( ELayoutEmpty, ELayoutEmpty );
 AknListBoxLayouts::SetupFormGfxCell( *iGrid, iGrid->ItemDrawer(), 0,
 }
 HandleFswContentChanged();
 iGrid->SetCurrentDataIndex(selIdx);
 UpdateGrid(ETrue, EFalse);
 DrawDeferred();
-}
+// Order full redraw after switch
+if(iRedrawTimer)
+{
+iRedrawTimer->Cancel();
+iRedrawTimer->After(KRedrawTimeForLayoutSwitch);
+}
+}
 TSLOG_OUT();
 }
 // -----------------------------------------------------------------------------
 // CTsFastSwapArea::Draw
 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.
 CTsAppUi* appui =
 static_cast<CTsAppUi*>( iEikonEnv->AppUi() );
-appui->MoveAppToBackground( AknTransEffect::EApplicationStartRect );
+appui->MoveAppToBackground( CTsAppUi::EActivationTransition );
 }
 }
 // --------------------------------------------------------------------------
 // CTsFastSwapArea::TryCloseAppL
 TSLOG_CONTEXT( TryCloseAppL, TSLOG_LOCAL );
 TSLOG2_IN( "%d %d", aIndex, aSuppressRendering );
 if ( aIndex >= 0 && aIndex < iArray.Count() && CanClose( aIndex ) )
 {
+TInt selIdx = SelectedIndex();
+if ( selIdx > aIndex && selIdx > 0 )
+{
+selIdx--;
+}
 TInt wgId = iArray[aIndex]->WgId();
 iFSClient->CloseApp( wgId );
 // The fsw content will change sooner or later
 // but the updated content (without the closed app) will not
 // come very fast. It looks better to the user if the item
 delete iArray[aIndex];
 iArray.Remove( aIndex );
 NotifyChange();
 if ( !aSuppressRendering )
 {
-RenderContentL();
+RenderContentL( ETrue );
 }
 // Update item selection on the screen if last item was deleted
 TInt newItemCount = GridItemCount();
 if ( aIndex == newItemCount )
 {
 newItemCount--;
 iGrid->SetCurrentDataIndex(newItemCount);
 }
-iTimeOfLastClose.HomeTime();
+else
+{
+DrawDeferred();
+iGrid->SetCurrentDataIndex(selIdx);
+}
 }
 TSLOG_OUT();
 }
 }
 if ( changed )
 {
 RenderContentL();
 RestoreSelectedIndex();
-iGrid->DrawNow();
+UpdateGrid();
 }
 }
 // --------------------------------------------------------------------------
 // CTsFastSwapArea::CanClose
 void CTsFastSwapArea::HandleFswContentChangedL()
 {
 TSLOG_CONTEXT( HandleFswContentChangedL, TSLOG_LOCAL );
 TSLOG_IN();
-// If there was an app close operation started during the last
-// few seconds then stop, to prevent flickering.
-TTime now;
-now.HomeTime();
-TTimeIntervalSeconds iv;
-if ( now.SecondsFrom( iTimeOfLastClose, iv ) == KErrNone
-&& iv.Int() <= KRefreshDelayAfterClose )
-{
-TSLOG1_OUT( "difference since last close is only %d sec, stop", iv.Int() );
-return;
-}
 // get current content from fastswap server
 iFSClient->GetContentL( iArray );
 SwapApplicationOrder( iArray );
 #ifdef _DEBUG
 // --------------------------------------------------------------------------
 // CTsFastSwapArea::RenderContentL
 // --------------------------------------------------------------------------
 //
-void CTsFastSwapArea::RenderContentL()
+void CTsFastSwapArea::RenderContentL( TBool aSuppressAnimation )
 {
 TSLOG_CONTEXT( RenderContentL, TSLOG_LOCAL );
 TSLOG_IN();
 _LIT(KSeparator, "\t");
-CArrayPtr<CGulIcon>* iconArray = new ( ELeave ) CAknIconArray( iArray.Count() );
+CArrayPtr<CGulIcon>* iconArray = new ( ELeave ) CAknIconArray( KMaxGranularity );
 CleanupStack::PushL( iconArray );
-CDesCArrayFlat* textArray = new ( ELeave ) CDesCArrayFlat( iArray.Count() );
+CDesCArrayFlat* textArray = new ( ELeave ) CDesCArrayFlat( KMaxGranularity );
 CleanupStack::PushL( textArray );
 RArray<TInt> closeItemArray;
 CleanupClosePushL(closeItemArray);
 TInt variety = Layout_Meta_Data::IsLandscapeOrientation() ? 1 : 0;
 CleanupClosePushL(rects);
 rects.ReserveL(KLayoutItemCount);
 GetFastSwapAreaRects(rects);
 TAknLayoutRect gridItem = rects[1];
 CleanupStack::PopAndDestroy(&rects);
-if ( AknLayoutUtils::LayoutMirrored() )
+if ( iArray.Count() )
 {
-iGrid->SetLayoutL( EFalse, EFalse, ETrue, iArray.Count(), 1, gridItem.Rect().Size(), iGridItemGap );
+if ( AknLayoutUtils::LayoutMirrored() )
-}
+{
-else
+iGrid->SetLayoutL( EFalse, EFalse, ETrue, iArray.Count(), 1, gridItem.Rect().Size(), iGridItemGap );
-{
+}
-iGrid->SetLayoutL( EFalse, ETrue, ETrue, iArray.Count(), 1, gridItem.Rect().Size(), iGridItemGap );
+else
-}
+{
+iGrid->SetLayoutL( EFalse, ETrue, ETrue, iArray.Count(), 1, gridItem.Rect().Size(), iGridItemGap );
+}
+}
 for ( TInt i = 0, ie = iArray.Count(); i != ie; ++i )
 {
 const TDesC& appName( iArray[i]->AppName() );
 const TInt formatLen = 3 + 2;
 RBuf formAppName;
 // Cleanup
 CleanupStack::PopAndDestroy(&closeItemArray);
 CleanupStack::Pop(textArray);
 CleanupStack::Pop(iconArray);
-iGrid->ScrollBarFrame()->SetScrollBarVisibilityL(
+if( iGrid->ScrollBarFrame() )
+{
+iGrid->ScrollBarFrame()->SetScrollBarVisibilityL(
 CEikScrollBarFrame::EOff, CEikScrollBarFrame::EOff);
+}
 // refresh the items in the grid
 if(iPreviousNoOfItems < iArray.Count())
 {
 iGrid->HandleItemAdditionL();
 {
 iGrid->HandleItemRemovalL();
 }
 iPreviousNoOfItems = iArray.Count();
 iEvtHandler.ReInitPhysicsL( GridWorldSize(), ViewSize(), ETrue );
-UpdateGrid( ETrue );
+UpdateGrid( ETrue, !aSuppressAnimation );
 TSLOG_OUT();
 }
 // --------------------------------------------------------------------------
 {
 iGrid->ShowHighlight();
 }
 RestoreSelectedIndex();
-UpdateGrid(ETrue, EFalse);
+UpdateGrid(EFalse, EFalse);
 iRedrawTimer->Cancel();
 iRedrawTimer->After(KRedrawTime);
 // give feedback
 else
 {
 // store the currently selected index if there is one
 SaveSelectedIndex();
 }
-iGrid->DrawDeferred();
 }
 // -----------------------------------------------------------------------------
 // CTsFastSwapArea::OfferKeyEventL
 // -----------------------------------------------------------------------------
 		{
 		if (!iGrid->IsHighlightVisible())
 			{
 			if (aType == EEventKey)
 				{
-				ShowHighlight();
+				iGrid->ShowHighlight();
 				iConsumeEvent = ETrue;
 				}
 			retVal = EKeyWasConsumed;
 			}
 		else if (iConsumeEvent)
 {
 ++highlightItem;
 }
 iSavedSelectedIndex = highlightItem - 1;//count from 0
 iGrid->SetCurrentDataIndex( iSavedSelectedIndex );
-TBool forceRedraw(ETrue);
-UpdateGrid(forceRedraw);
 }
 }
 // -----------------------------------------------------------------------------
 // CTsFastSwapArea::ProcessCommandL
 // Handle fsw popup commands
 // -----------------------------------------------------------------------------
 //
 void CTsFastSwapArea::ProcessCommandL( TInt aCommandId )
 {
+static_cast<CTsAppUi*>(iEikonEnv->AppUi())->DisablePopUpL();
 switch ( aCommandId )
 {
 case EFswCmdClose:
 TryCloseAppL( iAppIndexForPopup );
 break;
 iTapEvent.iType = TPointerEvent::EButton1Up;
 iGrid->HandlePointerEventL(iTapEvent);
 }
 else if(aSource == iRedrawTimer)
 {
-DrawNow();
+static_cast<CTsAppView*>(&iParent)->OrderFullWindowRedraw();
 }
 else if( aSource == iUpdateGridTimer )
 {
 UpdateGrid(ETrue, ETrue);
 }
 iPopup->SetItemDimmed( EFswCmdCloseAll, !showPopupItem );
 showPopUp = showPopUp || showPopupItem;
 if(showPopUp)
 {
+static_cast<CTsAppUi*>(iEikonEnv->AppUi())->RequestPopUpL();
 // give feedback
 LaunchPopupFeedback();
 // save index for later use & show popup
 iAppIndexForPopup = aIndex;
 iPopup->SetPosition( aPoint, CAknStylusPopUpMenu::EPositionTypeLeftBottom );
 {
 switch ( aEventType )
 {
 case EEventEnterKeyPressed:
 case EEventItemClicked:
+case EEventItemSingleClicked:
 {
 SwitchToApp(SelectedIndex());
 }
 break;
 case EEventPenDownOnItem:
 }
 iGrid->SetCurrentDataIndex(selectedItem);
 UpdateGrid(forceRedraw, animate);
 }
-// --------------------------------------------------------------------------
-// CTsFastSwapArea::ShowHiglight
-// --------------------------------------------------------------------------
-//
-void CTsFastSwapArea::ShowHighlight()
-{
-iGrid->ShowHighlight();
-UpdateGrid(ETrue, EFalse);
-}
 // --------------------------------------------------------------------------
 // CTsFastSwapArea::CenterItem
 // --------------------------------------------------------------------------
 //
 TPoint targetPoint = ItemViewPosition( SelectedIndex() );
 if ( aForceRedraw || targetPoint.iX != ViewPos().iX )
 {
 if ( aAnimate )
 {
+			iIgnorePhysicsMove = EFalse;
 iEvtHandler.Animate( targetPoint );
 }
 else
 {
 MoveOffset(targetPoint);
 {
 SelectNextItem();
 }
 else
 {
-ShowHighlight();
+iGrid->ShowHighlight();
 }
 }
 else if( aType == KAppKeyTypeLong )
 {
 SwitchToApp( SelectedIndex() );
 {
 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;
 currentXPos -= Rect().Width() / 2;
 TRect gridViewRect = Rect();
 gridViewRect.iTl.iX = -currentXPos;
 {
 // Center view
 gridViewRect.iTl.iX += ( Rect().Width() - GridItemCount() * iGridItemWidth ) / 2;
 }
 iGrid->SetRect( gridViewRect );
-DrawNow();
+DrawDeferred();
 }
 // --------------------------------------------------------------------------
 // CTsFastSwapArea::Tap
 // --------------------------------------------------------------------------
 TapL(aPoint);
 }
 }
 // --------------------------------------------------------------------------
-// CTsFastSwapArea::Drag
+// CTsFastSwapArea::DragL
 // --------------------------------------------------------------------------
 //
-void CTsFastSwapArea::Drag(
+void CTsFastSwapArea::DragL(
-const MAknTouchGestureFwDragEvent& /*aEvent*/)
+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();
-CenterItem( KUpdateGridTime );
-DrawNow();
 }
 // -----------------------------------------------------------------------------
 // CTsFastSwapArea::ViewSize
 // -----------------------------------------------------------------------------

branch	RCL_3
changeset 9	f966699dea19
parent 5	c743ef5928ba
child 15	ff572dfe6d86