MCL/sf/app/commonemail: comparison emailuis/emailui/src/FreestyleEmailUiLauncherGridVisualiser.cpp

equal deleted inserted replaced

-:b5fbb9b25d57
+:67369d1b217f
 /*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #include <aknstyluspopupmenu.h>
 #include <aknlayoutscalable_avkon.cdl.h>
 #include <aknlayoutscalable_apps.cdl.h>
 #include <layoutmetadata.cdl.h>
 #include <touchfeedback.h>
+#include <aknphysics.h>
 // INTERNAL INCLUDE FILES
 #include "FSEmailBuildFlags.h"
 #include "FreestyleEmailUiConstants.h"
 #include "FreestyleEmailUiLiterals.h"
 iRowHeight( 0 ),
 iColumnWidth( 0 ),
 	iSelector( 0 ),
 	iStartupAnimation( 0 ),
 	iStartupEffectStyle( 0 ),
-	iWizardWaitnoteShown( EFalse )
+	iWizardWaitnoteShown( EFalse ),
+	iPointerAction( EFalse ),
+iIsDragging( EFalse ),
+iScrolled( EFalse ),
+iLaunchWizardExecuted( EFalse )
 {
 FUNC_LOG;
 iItemIdInButtonDownEvent.iItemId = KErrNotFound;
 iItemIdInButtonDownEvent.iLaunchSelection = EFalse;
 iControl = aControl;
 iMailboxDeleter = CFSEmailUiMailboxDeleter::NewL( *iAppUi.GetMailClient(), *this );
 // Create startup timer
 iStartupCallbackTimer = CFSEmailUiGenericTimer::NewL( this );
+iCurrentLevel.iParentPos.iY = 0;
+iCurrentLevel.iParentPos.iX = 0;
+if ( CAknPhysics::FeatureEnabled() )
+{
+iPhysics = CAknPhysics::NewL(*this, NULL);
+}
 }
 // ----------------------------------------------------------------------------
 // CFSEmailUiLauncherGridVisualiser::DoFirstStartL()
 // Purpose of this function is to do first start only when grid is really
 iCoeControl = new( ELeave )CCoeControl;
 // Initial visual layout update is done when the view gets activated.
 iRefreshNeeded = ETrue;
+UpdatePhysicsL(); // init sizes for scrooling
 // First start toggle
 iConstructionCompleted = ETrue;
 }
 // ---------------------------------------------------------------------------
 transition = KScaleSelected;
 }
 TAlfTimedValue scaleValue;
 scaleValue.SetTarget( transition, KIconScalingTransitionTimeMs * 2 );
 iCurrentLevel.iItemVisualData[selectedItem].iImage->SetScale( scaleValue );
-HandleRowMovement( EDirectionTouch, selectedItem );
+if ( !iScrolled )
+{
+HandleRowMovement( EDirectionTouch, selectedItem );
+}
 }
 }
 CFSEmailUiLauncherGridVisualiser::~CFSEmailUiLauncherGridVisualiser()
 {
 delete iAiwSHandler;
 delete iScrollbar;
 delete iMailboxDeleter;
 delete iStylusPopUpMenu;
 delete iCoeControl;
+delete iPhysics;
 }
 void CFSEmailUiLauncherGridVisualiser::CreateModelL()
 {
 FUNC_LOG;
 itemInModel.Append( EFalse );
 }
 TInt count = reader.ReadInt16();
-// <cmail> Use layout data instead of hard-coded values
 TRect mainPaneRect;
 AknLayoutUtils::LayoutMetricsRect(AknLayoutUtils::EMainPane, mainPaneRect);
 TAknLayoutRect scrollBarRect;
 scrollBarRect.LayoutRect(mainPaneRect, AknLayoutScalable_Avkon::aid_size_touch_scroll_bar());
 itemRect.LayoutRect(gridRect, AknLayoutScalable_Apps::cell_cmail_l_pane(var,0,0));
 TAknLayoutRect gridIconLRect;
 gridIconLRect.LayoutRect(itemRect.Rect(), AknLayoutScalable_Apps::cell_cmail_l_pane_g1(var));
 TSize iconSize = gridIconLRect.Rect().Size();
-// </cmail>
 for ( TInt itemIndex = 0; itemIndex < count; itemIndex++ )
 {
 TInt itemId = reader.ReadInt16();
 switch ( itemId )
 		{
 		iFirstStartComplete = ETrue;
 	  	iAppUi.GridStarted( startedFromOds );
 	    iAppUi.ShowMailboxQueryL();
 		}
-	// <cmail>
 	else
 	    {
 	    // Ensure that FSMailServer is running, but don't do it on first
 	    // activation, as it's done anyway in AppUi's ConstructL
 	    TFsEmailUiUtility::EnsureFsMailServerIsRunning( iEikonEnv->WsSession() );
 void CFSEmailUiLauncherGridVisualiser::ChildDoDeactivate()
 {
 FUNC_LOG;
 iScrollbar->MakeVisible(EFalse);
-FadeOut(ETrue);  // hide CAlfVisuals on deactivation
 }
 void CFSEmailUiLauncherGridVisualiser::DynInitMenuPaneL(TInt aResourceId, CEikMenuPane* aMenuPane)
 	{
 FUNC_LOG;
 		   	aMenuPane->SetItemDimmed( EFsEmailUiCmdGoOnlineAll, ETrue );
 		   	aMenuPane->SetItemDimmed( EFsEmailUiCmdAbout, ETrue );
 			}
 		else
 			{
-		    // <cmail>
 		   	aMenuPane->SetItemDimmed( EFsEmailUiCmdAbout, ETrue );
-		   	// </cmail>
 		   	if( mbStatus.iMailboxCount <= 0 )
 		   	    {
 		   	    // If no mailboxes configured, dimm all mailbox related items
 		   	    aMenuPane->SetItemDimmed( EFsEmailUiCmdDeleteMailbox, ETrue );
 			break;
 			}
 		case EFsEmailUiCmdSync:
 case EFsEmailUiCmdSyncAll:
 			{
-			if (aCommand == EFsEmailUiCmdSyncAll)
-				{
-			   	iAppUi.ManualMailBoxSyncAll(ETrue);
-				}
-			else
-			    {
-			    iAppUi.ManualMailBoxSync(ETrue);
-			    }
 RPointerArray<CFSMailBox> mailBoxes;
 CleanupResetAndDestroyClosePushL( mailBoxes );
 TFSMailMsgId id;
 TInt err = iAppUi.GetMailClient()->ListMailBoxes(
 id,
 		|| (scanCode == EStdKeyDownArrow)
 		|| (scanCode == EStdKeyEnter)
 		|| (scanCode == EStdKeyDeviceA)
 		|| (scanCode ==EStdKeyDevice3))
 	{
+TBool scrolled = iScrolled;
-	if ( !iAppUi.SetFocusVisibility( ETrue ) )
+if ( iScrolled )
+{
+iScrolled = EFalse;
+SetFocusedItemL( iFirstVisibleRow * iVisibleColumns );
+}
+//iCurrentLevel.iSelected =
+	if ( !iAppUi.SetFocusVisibility( ETrue ) ||
+	     scrolled )
 		{
 				// focus is now activated. ignore key press.
 				UpdateFocusVisibility();
 				ResizeItemIcon( EFalse );
 				return ETrue;
 //
 TBool CFSEmailUiLauncherGridVisualiser::HandlePointerEventL(
 	const TAlfEvent& aEvent )
 {
 FUNC_LOG;
-TBool result( EFalse );
+if( !IsViewActive() )
-TInt currentlyFocused( iCurrentLevel.iSelected );
+{
+return EFalse;
+}
 TPointerEvent::TType type = aEvent.PointerEvent().iType;
 TInt id = FindPointedItem( aEvent );
-if( KErrNotFound != id )
+switch( type )
 {
-// The event coordinates correspond with an item.
+case TPointerEvent::EButton1Down:
-switch( type )
+{
-{
+iPreviousPosition = iOriginalPosition = aEvent.PointerEvent().iParentPosition;
-case TPointerEvent::EButton1Down:
+iPointerAction = ETrue;
+iIsDragging = EFalse;
+if( iPhysics )
+{
+iPhysics->StopPhysics();
+iPhysics->ResetFriction();
+iStartTime.HomeTime();
+UpdatePhysicsL();
+iTotalDragging = 0;
+}
+if ( id != KErrNotFound)
 {
 // tactile feedback
 MTouchFeedback* feedback = MTouchFeedback::Instance();
 if ( feedback )
 {
 iItemIdInButtonDownEvent.iItemId = id;
 iItemIdInButtonDownEvent.iLaunchSelection = ETrue;
 SetFocusedItemL( id );
 UpdateFocusVisibility();
-break;
 }
-case TPointerEvent::EButton1Up:
+break;
+}
+case TPointerEvent::EButton1Up:
+{
+if( iIsDragging && iPhysics )
+{
+TPoint drag( iOriginalPosition - aEvent.PointerEvent().iParentPosition );
+iPhysics->StartPhysics( drag, iStartTime );
+iIsDragging = EFalse;
+iPointerAction = EFalse;
+iTotalDragging = 0;
+}
+else if ( id != KErrNotFound )
 {
 if ( iStylusPopUpMenuLaunched )
-	{
+{
-	// A pop-up menu was launched. Do not open the selected
+// A pop-up menu was launched. Do not open the selected
-	// item.
+// item.
-	iItemIdInButtonDownEvent.iLaunchSelection = EFalse;
+iItemIdInButtonDownEvent.iLaunchSelection = EFalse;
-	break;
+break;
-	}
+}
 // Hide focus always after pointer up event.
 iAppUi.SetFocusVisibility( EFalse );
 // If key was released on item that had focus
 SelectL();
 }
 else
 {
 HandleButtonReleaseEvent();
-break;
 }
 }
-case TPointerEvent::EDrag:
+else if( iItemIdInButtonDownEvent.iItemId != KErrNotFound )
 {
-// if pointer is moved on to other item, decrease focused
+iItemIdInButtonDownEvent.iLaunchSelection = EFalse;
-// item's icon.
+ResizeItemIcon( ETrue );
-if ( ( currentlyFocused != id ) &&
-( iItemIdInButtonDownEvent.iItemId != KErrNotFound ) )
-{
-iItemIdInButtonDownEvent.iLaunchSelection = EFalse;
-ResizeItemIcon( ETrue );
-}
-// if pointer is moved on item that has focus, increase item's
-// icon.
-else if ( id == iItemIdInButtonDownEvent.iItemId )
-{
-iItemIdInButtonDownEvent.iLaunchSelection = ETrue;
-ResizeItemIcon( EFalse );
-}
-break;
-}
-case TPointerEvent::EButtonRepeat:
-	{
-	// Long tap.
-if ( currentlyFocused != id ||
-iItemIdInButtonDownEvent.iItemId == KErrNotFound )
-		{
-		// The item beneath the touch was changed during the long
-		// tap. Thus, do not show the pop-up.
-		break;
-		}
-	// Check the type of the currently selected item.
-			TInt itemType = iCurrentLevel.iItems[id].iId;
-				if ( itemType == EDefaultMailboxItem ||
-					 itemType == EOtherMailboxItems )
-				{
-				// The selected item is a mail box. Launch the pop-up
-				// menu.
-	            LaunchStylusPopupMenu( id );
-				}
-	break;
-	}
-default:
-{
-break;
-}
-}
-result = ETrue;
-}
-// if event do not concern any of items.
-else if( iItemIdInButtonDownEvent.iItemId != KErrNotFound )
-{
-iItemIdInButtonDownEvent.iLaunchSelection = EFalse;
-ResizeItemIcon( ETrue );
-switch( type )
-{
-case TPointerEvent::EButton1Down:
-{
-// ask if focus is on (flip open)
-// iItemIdInButtonDownEvent.iItemId = currentlyFocused
-break;
-}
-case TPointerEvent::EButton1Up:
-{
 // Hide focus always after pointer up event.
 iAppUi.SetFocusVisibility( EFalse );
 iItemIdInButtonDownEvent.iItemId = KErrNotFound;
 HandleButtonReleaseEvent();
-break;
 }
-default:
+else
 {
-break;
+iAppUi.SetFocusVisibility( EFalse );
 }
-}
+			break;
 }
-else
+case TPointerEvent::EDrag:
 {
-if( aEvent.IsPointerEvent() && aEvent.PointerUp() )
+if( iPhysics )
 {
-// Hide focus always after pointer up event.
+TPoint position = aEvent.PointerEvent().iParentPosition;
-iAppUi.SetFocusVisibility( EFalse );
+TPoint delta( 0, iPreviousPosition.iY - position.iY );
-}
+iTotalDragging = iTotalDragging + delta.iY;
-}
+if (Abs(iTotalDragging) >= iPhysics->DragThreshold() || iIsDragging )
+{
-return result;
+// Hide focus always when dragging.
+iAppUi.SetFocusVisibility( EFalse );
+if ( iSelector )
+{
+TAlfTimedValue selectorOpacity;
+selectorOpacity.SetValueNow( 0 );
+iSelector->SetOpacity( selectorOpacity );
+}
+iIsDragging = ETrue;
+iPhysics->RegisterPanningPosition( delta );
+iScrolled = ETrue;
+}
+// Save current position as previous pos for future calculations
+iPreviousPosition = position;
+}
+break;
+}
+case TPointerEvent::EButtonRepeat:
+	{
+	if (!iIsDragging && id != KErrNotFound )
+	    {
+	            // Check the type of the currently selected item.
+			TInt itemType = iCurrentLevel.iItems[id].iId;
+				if ( itemType == EDefaultMailboxItem ||
+					 itemType == EOtherMailboxItems )
+					{
+					// The selected item is a mail box. Launch the pop-up
+					// menu.
+	            	LaunchStylusPopupMenu( id );
+				}
+	    }
+	break;
+}
+default:
+{
+break;
+}
+}
+return ETrue;
 }
 // ---------------------------------------------------------------------------
 // CFSEmailUiLauncherGridVisualiser::FindPointedItem
 //
 if ( iCurrentLevel.iSelected >= itemCount )
 {
 iCurrentLevel.iSelected = itemCount - 1;
 }
 }
+if (!iPointerAction)
-TInt x = iCurrentLevel.iSelected % iVisibleColumns;
+{
-TInt y = (iCurrentLevel.iSelected-x) / iVisibleColumns;
+TInt x = iCurrentLevel.iSelected % iVisibleColumns;
+TInt y = (iCurrentLevel.iSelected-x) / iVisibleColumns;
 ScrollToRow( y );
+}
 }
 void CFSEmailUiLauncherGridVisualiser::MoveSelectorToCurrentItem( TDirection aDir )
 {
 FUNC_LOG;
 TAlfRealPoint curPos = iSelector->Pos().ValueNow(); // this is the wrapped value of the current position
 iSelector->SetPos( curPos, 0 ); // wrap position now
 // Calculate where are we heading
-// <cmail> Platform layout change
 CAlfVisual* selectedBase = iCurrentLevel.iItemVisualData[iCurrentLevel.iSelected].iBase;
 TPoint displayPos = selectedBase->LocalToDisplay( selectedBase->Pos().Target() );
-// </cmail>
 TPoint targetPos = iSelector->DisplayToLocal( displayPos );
 // Check if we need to wrap the selector over the edge of the screen
 TPoint ringWrapOffset( 0, 0 );
 const TInt KGridWrapWidth = (iVisibleColumns+2)*iColumnWidth;
 }
 targetPos += ringWrapOffset;
 // Animate the movement to the new position
 TInt animTime = KSelectTransitionTimeMs;
-// <cmail>
 if ( aDir == EDirectionReset || aDir == EDirectionNone || aDir == EDirectionTouch )
-// </cmail>
 {
 animTime = KStartupAnimationTime;
 }
 iSelector->SetPos( targetPos, animTime );
 }
 {
 // Invalid row
 return;
 }
-// <cmail> Fix scrolling so that it works properly with 2 visible rows (landscape layout data)
 if ( iFirstVisibleRow + iVisibleRows - 1 < aRow )
 {
 // Scroll downwards
-//        if ( aRow == iRowCount - 1 )
+iFirstVisibleRow = aRow - iVisibleRows + 1 ;
-//            {
-iFirstVisibleRow = aRow - iVisibleRows + 1 ;
-//           }
-//        else
-//            {
-//            iFirstVisibleRow = aRow - iVisibleRows + 2;
-//            }
 }
 else if ( iFirstVisibleRow > aRow )
 {
 // Scroll upwards
 if ( aRow == 0 )
 offset = iFirstVisibleRow * iRowHeight;
 TAlfTimedPoint alfScrollOffset;
 alfScrollOffset.iY.SetTarget( offset , KScrollTransitionTimeMs );
 iCurrentLevel.iGridLayout->SetScrollOffset(alfScrollOffset);
-// <cmail>
+iScrollbarModel.SetFocusPosition(offset);
-iScrollbarModel.SetFocusPosition(iFirstVisibleRow);
 TRAP_IGNORE( iScrollbar->SetModelL(&iScrollbarModel) );
 iScrollbar->DrawNow();
-// </cmail>
 }
 void CFSEmailUiLauncherGridVisualiser::RefreshLauncherViewL()
 {
 FUNC_LOG;
 void CFSEmailUiLauncherGridVisualiser::SelectL()
 	{
 FUNC_LOG;
 	if ( !iAppUi.ViewSwitchingOngoing() )
 		{
+iPointerAction = EFalse;
 iItemIdInButtonDownEvent.iItemId = KErrNotFound;
 UpdateFocusVisibility();
 		CFSEmailLauncherItem* launcherItem =
 		    iCurrentLevel.iItems[iCurrentLevel.iSelected].iLauncherItem;
 	                }
 	            	break;
 	            case EAddNewMailboxItem:
 	                {
 // To prevent accidental double clicks of the wizard item
-	                // wizard would crash without this
+	                // wizard would crash without this - moved to function
-	                if ( !iDoubleClickLock )
-	                    {
-	                    iDoubleClickLock = ETrue;
 	                    LaunchWizardL();
-	                }
 	                }
 	            	break;
 	            case EHelpItem:
 	                {
 // To prevent accidental double clicks of the help item
 		    }
 		}
 	}
-void CFSEmailUiLauncherGridVisualiser::HandleForegroundEventL()
+void CFSEmailUiLauncherGridVisualiser::HandleForegroundEventL( TBool aForeground )
 {
 FUNC_LOG;
 UpdateFocusVisibility();
 // Toggle safety lock always when receiving foreground back.
-if ( iFirstStartComplete && iDoubleClickLock )
+if ( aForeground && iDoubleClickLock && iFirstStartComplete )
 {
 iDoubleClickLock = EFalse;
 }
 }
 if ( !iConstructionCompleted )
 {
 DoFirstStartL();
 }
-iAiwSHandler->ExecuteServiceCmdL( KAiwCmdSettingWizardFsEmail.iUid,
+if ( ! iLaunchWizardExecuted  ) // prevent reentrant calling
-iAiwSHandler->InParamListL(),
+{
-iAiwSHandler->OutParamListL() );
+iLaunchWizardExecuted = ETrue;
+TRAPD( err, iAiwSHandler->ExecuteServiceCmdL( KAiwCmdSettingWizardFsEmail.iUid,
+iAiwSHandler->InParamListL(),
+iAiwSHandler->OutParamListL() ) );
+// ExecuteServiceCmdL is synchronous - uses CActiveSchedulerWait
+iLaunchWizardExecuted = EFalse;
+User::LeaveIfError( err );
+}
 }
 void CFSEmailUiLauncherGridVisualiser::GoToInboxL( TFSMailMsgId& aMailboxId, TFSMailMsgId& aMailboxInboxId )
 {
 FUNC_LOG;
 void CFSEmailUiLauncherGridVisualiser::RescaleIconsL()
 	{
 FUNC_LOG;
 if ( iConstructionCompleted )
 {
-	// <cmail> Use layout data instead of hard-coded values
 		TRect mainPaneRect;
 	    AknLayoutUtils::LayoutMetricsRect(AknLayoutUtils::EMainPane, mainPaneRect);
 	    TInt var = Layout_Meta_Data::IsLandscapeOrientation() ? 1 : 0;
 	    TAknLayoutRect scrollBarRect;
 	    gridIconRect.LayoutRect(itemRect.Rect(), AknLayoutScalable_Apps::cell_cmail_l_pane_g1(var));
 	   	//TInt gridIconSize = iAppUi.LayoutHandler()->GridIconSize();
 		TSize iconSize = gridIconRect.Rect().Size();
 		//iconSize.SetSize( gridIconSize, gridIconSize );
-	// </cmail>
 // Scale bitmaps
 for( TInt i = 0 ; i < iIconArray.Count() ; i++ )
 {
 iIconArray[i]->Size().SetSize( iconSize.iWidth, iconSize.iHeight );
 HBufC* launcherItemText = aItem->Caption( EFalse ).AllocLC();
 CAknIcon* launcherItemIcon = aItem->Icon();
 if ( launcherItemIcon )
 {
-// <cmail> Use layout data instead of hard-coded values
 TRect mainPaneRect;
 AknLayoutUtils::LayoutMetricsRect(AknLayoutUtils::EMainPane, mainPaneRect);
 TAknLayoutRect scrollBarRect;
 scrollBarRect.LayoutRect(mainPaneRect, AknLayoutScalable_Avkon::aid_size_touch_scroll_bar());
 TAknLayoutRect gridIconRect;
 gridIconRect.LayoutRect(itemRect.Rect(), AknLayoutScalable_Apps::cell_cmail_l_pane_g1(var));
 TSize iconSize = gridIconRect.Rect().Size();
-// </cmail>
 const CFbsBitmap* bitmap = launcherItemIcon->Bitmap();
 const CFbsBitmap* mask = launcherItemIcon->Mask();
 			// First add plugin id and icon id pair to array, needed in provide bitmap
 			// Create texture, goes to provide bitmap
 			CAlfTexture* texture = &CAlfStatic::Env().TextureManager().CreateTextureL( iPluginTextureId, this, EAlfTextureFlagDefault );
 			// Update texture id
 			iPluginTextureId++; // Id is updated dynamically
-			// Set initiel size
+			// Set initial size
-// <cmail> Use layout data instead of hard-coded values
-			//TSize iconSize(iAppUi.LayoutHandler()->GridIconSize(), iAppUi.LayoutHandler()->GridIconSize() );
-// <cmail>
 			texture->Size().SetSize( iconSize.iHeight, iconSize.iWidth );
 iModel->AddL(
 EShortcut,
 aItem->Id(),
 *launcherItemText,
 FUNC_LOG;
 if ( iConstructionCompleted )
 {
 	    iCurrentLevel.iParent = 0;
-	// <cmail> Use layout data instead of hard-coded values
 	    TRect mainPaneRect;
 	    AknLayoutUtils::LayoutMetricsRect(AknLayoutUtils::EMainPane, mainPaneRect);
 	    TInt var = Layout_Meta_Data::IsLandscapeOrientation() ? 1 : 0;
 	    TAknLayoutRect scrollBarRect;
-	    // <cmail>
-//	    scrollBarRect.LayoutRect(mainPaneRect, AknLayoutScalable_Avkon::aid_size_touch_scroll_bar());
 	    scrollBarRect.LayoutRect(mainPaneRect, AknLayoutScalable_Apps::scroll_pane_cp03());
-	    // </cmail>
 	    TRect gridRect = mainPaneRect;
 	    gridRect.iBr.iX -= scrollBarRect.Rect().Width();
 	    TAknLayoutRect cellRect;
 	    cellRect.LayoutRect(gridRect, AknLayoutScalable_Apps::aid_size_cell_cmail_l(var, 0, 0));
 	    TSize displaySize = mainPaneRect.Size();
 	    TInt columns = iVisibleColumns = AknLayoutScalable_Apps::cell_cmail_l_pane_ParamLimits(var).LastColumn() + 1;
 	    TInt rows = iVisibleRows = AknLayoutScalable_Apps::cell_cmail_l_pane_ParamLimits(var).LastRow() + 1;
-	// </cmail>
 iCurrentLevel.iGridLayout->SetSize( gridRect.Size() );
 iCurrentLevel.iGridLayout->SetColumnsL( columns );
 iCurrentLevel.iGridLayout->SetRowsL( rows );
 PopulateL( iCurrentLevel );
 UpdateScrollBarRangeL();
 TInt scrollbarWidth = scrollBarRect.Rect().Width();
-// <cmail>
 if( iRowCount > iVisibleRows )
 {
 iScrollbar->MakeVisible(ETrue);
 }
 else
 {
 iScrollbar->MakeVisible(EFalse);
 }
-// </cmail>
 TInt scrollbarTopLeftX = displaySize.iWidth - scrollbarWidth;
 TInt scrollbarTopLeftY = 0;
 TInt scrollbarBottomRightX = displaySize.iWidth;
 TInt scrollbarBottomRightY = displaySize.iHeight;
 // Selector ring wrap limits can be calculated when row and column sizes are known.
 SetRingWrapLimits();
 MoveSelection( EDirectionNone );
-	    // <cmail>
 TRect scrollbarRect;
 scrollbarRect.SetRect(scrollbarTopLeftX, scrollbarTopLeftY, scrollbarBottomRightX, scrollbarBottomRightY);
 scrollbarRect.Move(mainPaneRect.iTl);
 iScrollbar->SetRect(scrollbarRect);
 iScrollbar->DrawDeferred();
-	    // </cmail>
 iRefreshNeeded = EFalse;
 }
 }
 void CFSEmailUiLauncherGridVisualiser::SetRingWrapLimits()
 {
 iRefreshNeeded = ETrue;
 }
 }
 }
-// <cmail>
 void CFSEmailUiLauncherGridVisualiser::ConstructScrollbarL( CAlfLayout* aParent )
 	{
 FUNC_LOG;
 	CAlfLayout::AddNewL(*iControl, aParent);
 	iScrollbar = new (ELeave) CAknDoubleSpanScrollBar(0);
 void CFSEmailUiLauncherGridVisualiser::UpdateScrollBarRangeL()
 	{
 FUNC_LOG;
-	iScrollbarModel.SetScrollSpan(iRowCount);
+TRect mainPaneRect;
-	iScrollbarModel.SetWindowSize(iVisibleRows);
+AknLayoutUtils::LayoutMetricsRect(AknLayoutUtils::EMainPane, mainPaneRect);
+TAknLayoutRect scrollBarRect;
+scrollBarRect.LayoutRect(mainPaneRect, AknLayoutScalable_Avkon::aid_size_touch_scroll_bar());
+iScrollbarModel.SetScrollSpan(iRowCount * (scrollBarRect.Rect().Height() / iVisibleRows));
+iScrollbarModel.SetWindowSize(scrollBarRect.Rect().Height());
 	iScrollbarModel.SetFocusPosition(iFirstVisibleRow);
 	iScrollbar->SetModelL(&iScrollbarModel);
 	iScrollbar->DrawNow();
 	}
 void CFSEmailUiLauncherGridVisualiser::HandleScrollEventL(CEikScrollBar* aScrollBar, TEikScrollEvent aEventType)
 {
 FUNC_LOG;
-const TInt KScrollTransitionTimeMs = KSelectTransitionTimeMs;
+if( iPhysics )
+{
+iPhysics->StopPhysics();
+iPhysics->ResetFriction();
+}
 if (aScrollBar == iScrollbar)
 {
 switch( aEventType )
 {
 case EEikScrollHome :
 //Jump to beginning
 break;
 case EEikScrollEnd :
 //Jump to end
 break;
 default:
-iFirstVisibleRow = aScrollBar->ThumbPosition();
+iScrolled = ETrue;
-TReal offset = iFirstVisibleRow * iRowHeight;
+iAppUi.SetFocusVisibility( EFalse );
+if ( iSelector )
+{
+TAlfTimedValue selectorOpacity;
+selectorOpacity.SetValueNow( 0 );
+iSelector->SetOpacity( selectorOpacity );
+}
+iFirstVisibleRow = iCurrentLevel.iParentPos.iY/iRowHeight;
+TReal offset = aScrollBar->ThumbPosition() + 1;
 TAlfTimedPoint alfScrollOffset;
-alfScrollOffset.iY.SetTarget( offset , KScrollTransitionTimeMs );
+alfScrollOffset.iY.SetTarget( offset , 0);
-iCurrentLevel.iGridLayout->SetScrollOffset(alfScrollOffset);
+				 iCurrentLevel.iGridLayout->SetScrollOffset(alfScrollOffset);
+iCurrentLevel.iParentPos.iY = offset;
 break;
 }
 }
 }
-// </cmail>
 void CFSEmailUiLauncherGridVisualiser::UpdateLauncherItemListL()
 {
 FUNC_LOG;
 // Read info about all implementations into infoArray
 // Bitmap provider for grid ecom plugins icons
 void CFSEmailUiLauncherGridVisualiser::ProvideBitmapL(TInt aId, CFbsBitmap*& aBitmap, CFbsBitmap*& aMaskBitmap)
 	{
 FUNC_LOG;
-// <cmail> Use layout data instead of hard-coded values
 TRect mainPaneRect;
 AknLayoutUtils::LayoutMetricsRect(AknLayoutUtils::EMainPane, mainPaneRect);
 TInt var = Layout_Meta_Data::IsLandscapeOrientation() ? 1 : 0;
 TAknLayoutRect scrollBarRect;
 TAknLayoutRect itemRect;
 itemRect.LayoutRect(gridRect, AknLayoutScalable_Apps::cell_cmail_l_pane(var, 0, 0));
 TAknLayoutRect gridIconRect;
 gridIconRect.LayoutRect(itemRect.Rect(), AknLayoutScalable_Apps::cell_cmail_l_pane_g1(var));
-// </cmail>
 	CAknIcon* launcherItemIcon(0);
 	for ( TInt i=0; i<iPluginIdIconIdPairs.Count(); i++ )
 		{
 		if ( aId == iPluginIdIconIdPairs[i].iIconId )
 			}
 		}
 	if ( launcherItemIcon )
 		{
-// <cmail> Use layout data instead of hard-coded values
 		// Set bitmap size
-	    //TSize iconSize(iAppUi.LayoutHandler()->GridIconSize(), iAppUi.LayoutHandler()->GridIconSize() );
 		TSize iconSize = gridIconRect.Rect().Size();
-// </cmail>
 		if( launcherItemIcon->Bitmap() )
 {
 AknIconUtils::DisableCompression( launcherItemIcon->Bitmap() );
 AknIconUtils::SetSize( launcherItemIcon->Bitmap(), iconSize, EAspectRatioPreserved );
 }
 CFsEmailUiViewBase::FocusVisibilityChange( aVisible );
 UpdateFocusVisibility();
 ResizeItemIcon( !aVisible );
 	}
+// -----------------------------------------------------------------------------
+// CFSEmailUiLauncherGridVisualiser::ViewPositionChanged
+// From MAknPhysicsObserver
+// -----------------------------------------------------------------------------
+//
+void CFSEmailUiLauncherGridVisualiser::ViewPositionChanged(
+const TPoint& aNewPosition,
+TBool /*aDrawNow*/,
+TUint /*aFlags*/ )
+{
+FUNC_LOG;
+// controls must be created first
+if ( !iConstructionCompleted )
+{
+return;
+}
+TRect mainPaneRect;
+AknLayoutUtils::LayoutMetricsRect(AknLayoutUtils::EMainPane, mainPaneRect);
+iCurrentLevel.iParentPos.iY = aNewPosition.iY - mainPaneRect.Height()/2;
+TAlfTimedPoint alfScrollOffset;
+alfScrollOffset.iY.SetTarget( iCurrentLevel.iParentPos.iY , 0 );
+iCurrentLevel.iGridLayout->SetScrollOffset(alfScrollOffset);
+iScrollbarModel.SetFocusPosition( iCurrentLevel.iParentPos.iY );
+TRAP_IGNORE( iScrollbar->SetModelL(&iScrollbarModel) );
+iScrollbar->DrawNow();
+iFirstVisibleRow = iCurrentLevel.iParentPos.iY/iRowHeight;
+if ( iFirstVisibleRow < 0 )
+{
+iFirstVisibleRow = 0;
+}
+else if ( iFirstVisibleRow > iRowCount )
+{
+iFirstVisibleRow = iRowCount;
+}
+}
+// -----------------------------------------------------------------------------
+// CNcsComposeViewContainer::PhysicEmulationEnded
+// From MAknPhysicsObserver
+// -----------------------------------------------------------------------------
+//
+void CFSEmailUiLauncherGridVisualiser::PhysicEmulationEnded()
+{
+FUNC_LOG;
+}
+// -----------------------------------------------------------------------------
+// CNcsComposeViewContainer::ViewPosition
+// From MAknPhysicsObserver
+// -----------------------------------------------------------------------------
+//
+TPoint CFSEmailUiLauncherGridVisualiser::ViewPosition() const
+{
+FUNC_LOG;
+TRect mainPaneRect;
+AknLayoutUtils::LayoutMetricsRect(AknLayoutUtils::EMainPane, mainPaneRect);
+TInt current = iCurrentLevel.iParentPos.iY;
+TInt viewCentre = mainPaneRect.Size().iHeight / 2;
+TPoint point( 0, current + viewCentre );
+return point;
+}
 // ----------------------------------------------------------------------------
 // LaunchStylusPopupMenuL()
 // Launches and displays the pop-up menu invoked by a long tap event.
 // ----------------------------------------------------------------------------
 }
 iStartupCallbackTimer->Cancel();
 }
+// ---------------------------------------------------------------------------
+// CFSEmailUiLauncherGridVisualiser::UpdatePhysicsL()
+// ---------------------------------------------------------------------------
+//
+void CFSEmailUiLauncherGridVisualiser::UpdatePhysicsL()
+{
+FUNC_LOG;
+if ( iPhysics )
+{
+TRect mainPaneRect;
+AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane, mainPaneRect );
+const TSize viewSize( mainPaneRect.Size() );
+const TSize worldSize( 0, iRowCount * iRowHeight );
+iPhysics->InitPhysicsL( worldSize, viewSize, EFalse );
+}
+}

branch	RCL_3
changeset 17	67369d1b217f
parent 16	b5fbb9b25d57
child 20	efd4f1afd43e