FCL/sf/app/homescreen: comparison menufw/menufwui/mmwidgets/src/mmwidgetcontainer.cpp

equal deleted inserted replaced

-:fb3763350a08
+:4d54b72983ae
 * Nokia Corporation - initial contribution.
 *
 * Contributors:
 *
 * Description:
-*  Version     : %version: MM_71.1.17.1.47 % << Don't touch! Updated by Synergy at check-out.
+*  Version     : %version: MM_71.1.17.1.49 % << Don't touch! Updated by Synergy at check-out.
 *
 */
 #include <e32keys.h>
 #include "mmwidgetcontainer.h"
 #include "mmlistboxmodel.h"
 #include "mmmarqueeadapter.h"
 #include "mmwidgetobserver.h"
-#include "mmhighlighttimer.h"
 #include "mmvisibilityobserver.h"
 #include "mmlistboxcontainer.h"
 #include "mmgridcontainer.h"
 #include "mmlistboxitemdrawer.h"
 #include "mmmarqueeadapter.h"
 //
 // -----------------------------------------------------------------------------
 //
 void CMmWidgetContainer::ConstructL()
 	{
-if ( AknLayoutUtils::PenEnabled() )
-	{
-	iTimer = CMmHighlightTimer::NewL( this );
-	}
 iBgContext = CAknsBasicBackgroundControlContext::NewL(
 	KAknsIIDQsnBgAreaMainAppsGrid, Rect(), EFalse);
 iLongTapDetector = CAknLongTapDetector::NewL( this );
 iLongTapDetector->EnableLongTapAnimation(ETrue);
 	}
 //
 CMmWidgetContainer::~CMmWidgetContainer()
 {
 AknsUtils::DeregisterControlPosition( this );
 AknsUtils::DeregisterControlPosition( this->iWidget );
-delete iTimer;
 delete iBgContext;
 delete iPostProcessor;
 delete iLongTapDetector;
 }
 iHasFocus = aHasFocus;
 StartOrStopMarquee();
 }
 if ( !aHasFocus )
 	{
-	ASSERT(iTimer);
+	SetHighlightVisibilityL( EFalse );
-	iTimer->StopL();
 	}
 }
 // -----------------------------------------------------------------------------
 //
 if ( !!aIsFaded != !!iIsFaded ) // logical Ex-OR
 {
 iIsFaded = aIsFaded;
 StartOrStopMarquee();
 }
+}
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+TBool CMmWidgetContainer::LongTapInProgress() const
+{
+return iLongTapInProgress;
 }
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 	iMarqueeAdapter->StopMarqueeDrawing();
 	}
 TInt index = KErrNotFound;
 TBool itemExists = iWidget->View()->XYPosToItemIndex( aPointerEvent.iPosition, index );
+if ( iLongTapDetector )
+{
+if ( aPointerEvent.iType == TPointerEvent::EButton1Down )
+{
+iLongTapDetector->EnableLongTapAnimation( itemExists &&
+GetMmModel()->GetNumberOfSpecificMenuItemsL( index ) > 0 );
+}
+TPointerEvent longTapPointerEvent = aPointerEvent;
+if ( aPointerEvent.iType == TPointerEvent::EButtonRepeat )
+{
+longTapPointerEvent.iType = TPointerEvent::EDrag;
+}
+iLongTapDetector->PointerEventL( longTapPointerEvent );
+}
 CCoeControl::HandlePointerEventL(aPointerEvent);
 if ( aPointerEvent.iType == TPointerEvent::EButton1Down
 && itemExists  )
 	{
 	if ( itemExists )
 		{
 	if ( GetHighlight() != index )
 	    {
-	    iTimer->StopL();
+	    SetHighlightVisibilityL( EFalse );
 	    if ( IsEditMode() )
 	    	{
 		    SetHighlightL( index );
 	    	}
 	    }
 		}
 	else
 		{
-		iTimer->StopL();
+		SetHighlightVisibilityL( EFalse );
 		}
 	}
 	TInt lastTopItemIndex = Widget()->TopItemIndex();
 if ( IsEditMode() && iDragAndDropObserver )
 	{
 		HandlePointerEventsInEditModeL(aPointerEvent, abortAnimation);
 	}
-if ( iLongTapDetector )
-	{
-	if ( !itemExists )
-	    {
-	    iLongTapDetector->EnableLongTapAnimation( EFalse );
-	    }
-	TPointerEvent longTapPointerEvent = aPointerEvent;
-if ( aPointerEvent.iType == TPointerEvent::EButtonRepeat )
-	{
-	longTapPointerEvent.iType = TPointerEvent::EDrag;
-	}
-iLongTapDetector->PointerEventL( longTapPointerEvent );
-	}
 }
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 	    		iDrawer->Gc() );
 #endif
 if ( !aEnable )
 {
 iWidget->View()->ItemDrawer()->SetFlags(
-CListItemDrawer::EDisableHighlight );
+CListItemDrawer::ESingleClickDisabledHighlight );
 #ifdef RD_UI_TRANSITION_EFFECTS_LIST
 	    if ( transApi )
 	        {
 	transApi->Remove( MAknListBoxTfxInternal::EListHighlight );
 	        }
 #endif
 }
 else
 {
 iWidget->View()->ItemDrawer()->ClearFlags(
-CListItemDrawer::EDisableHighlight );
+CListItemDrawer::ESingleClickDisabledHighlight );
 }
-}
+if ( IsVisible() )
-// -----------------------------------------------------------------------------
+{
-//
+TInt highlight = GetHighlight();
-// -----------------------------------------------	------------------------------
+CListBoxView* view = Widget()->View();
+Widget()->DrawNow( TRect( view->ItemPos( highlight ),
+view->ItemSize( highlight ) ) );
+}
+}
+// -----------------------------------------------------------------------------
+//
+// ----------------------------------------------------------------------------
 //
 EXPORT_C TBool CMmWidgetContainer::IsHighlightVisible()
 {
-return IsTimerActive();
+return !( iWidget->View()->ItemDrawer()->Flags() &
+		CListItemDrawer::ESingleClickDisabledHighlight );
 }
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 }
 }
 if ( resp == EKeyWasNotConsumed )
 {
-//        here is a workaround for avkon to enable cursor movement we need to set highlight visibility
-//        to ETrue so that single click implementation in avkon will change the current item index.
-SetHighlightVisibilityL(ETrue); //workaround
 resp = iWidget->OfferKeyEventL( aKeyEvent, aType );
-SetHighlightVisibilityL(EFalse);//workaround
 }
 if ( iKeyEventObserver )
 	{
 	resp = iKeyEventObserver->HandleKeyPressedL( aKeyEvent, aType );
 		{
 		iAllowLongPress = ETrue;
 			SetHighlightVisibilityL( ETrue );
 			SetDefaultHighlightL( ETrue );
-			if ( iTimer )
+			HandleForegroundGainedL();
-				{
-				iTimer->StartL( KDelayInSeconds6, EFalse );
-				HandleForegroundGainedL();
-				}
 			}
 	}
 return resp;
 }
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-//
-//TBool CMmWidgetContainer::HighlightWouldLoop( const TKeyEvent& aKeyEvent,
-//		const TEventCode& aType )
-//	{
-//	TInt viewColCount ( ColumnsInCurrentView() );
-//
-//	if ( viewColCount == 0 )
-//		return ETrue;
-//
-//	// this allows to finish drag'n'drop operation
-//	if ( iDraggedIndex != KErrNotFound && aType == EEventKeyUp )
-//		return EFalse;
-//
-//	TBool wouldLoop = EFalse;
-//	TInt highlightIndex = GetHighlight();
-//
-//	TInt highlightRow = highlightIndex / viewColCount;
-//	TInt lastRowWithItems = ( NumberOfItems() - 1 ) / viewColCount;
-//	TInt highlightCol = highlightIndex % viewColCount;
-//	TInt lastItemCol = ( NumberOfItems() - 1 ) % viewColCount;
-//
-//	TInt keyScanCode = aKeyEvent.iScanCode;
-//
-//	if ( AknLayoutUtils::LayoutMirrored() )
-//		{
-//		if ( keyScanCode == EStdKeyLeftArrow )
-//			keyScanCode = EStdKeyRightArrow;
-//		else if ( keyScanCode == EStdKeyRightArrow )
-//			keyScanCode = EStdKeyLeftArrow;
-//		}
-//
-//	if ( keyScanCode == EStdKeyRightArrow )
-//		{
-//			if ( highlightIndex == NumberOfItems() - 1 )
-//				wouldLoop = ETrue;
-//			else if ( highlightCol == viewColCount - 1 )
-//				wouldLoop = ETrue;
-//		}
-//	else if ( keyScanCode == EStdKeyLeftArrow )
-//		{
-//			if ( highlightCol == 0 )
-//				wouldLoop = ETrue;
-//		}
-//	else if ( keyScanCode == EStdKeyUpArrow )
-//		{
-//			if ( highlightRow == 0 )
-//				wouldLoop = ETrue;
-//		}
-//	else if ( keyScanCode == EStdKeyDownArrow )
-//		{
-//			if ( highlightRow == lastRowWithItems )
-//				wouldLoop = ETrue;
-//			else if ( highlightRow == lastRowWithItems - 1 && highlightCol > lastItemCol)
-//				wouldLoop = ETrue;
-//		}
-//
-//	return wouldLoop;
-//	}
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 //
 							|| aKeyEvent.iScanCode == EStdKeyDownArrow;
 // handle arrow: draw highlight when arrow used
 if ( arrowHasHandling )
 {
-if ( !iTimer->IsActive() )
+if ( !IsHighlightVisible() )
 {
 if ( aType == EEventKey  || aType == EEventKeyUp )
 {
-// if no highlight and key released - show highlight
+SetHighlightVisibilityL( ETrue );
-SetDefaultHighlightL( EFalse );
+SetDefaultHighlightL( ETrue );
 }
-	// ignore all navigation events when highlight not visible
+	// override avkon's default highlight setting
 	resp = EKeyWasConsumed;
 }
 else
 {
 // this block is used to set the highlight only once for each event
 if ( aKeyEvent.iRepeats > 0 )
 {
 // if repeated key events we move focus on EEventKey
 if ( aType == EEventKey )
 {
 SetHighlightL( iWidget->CurrentItemIndex() );
 }
 }
 }
-	// run timer in order to hide the highlight
-	    if ( aType == EEventKey && iTimer)
-	        {
-	        iTimer->StartL( KDelayInSeconds6, EFalse );
-	        HandleForegroundGainedL();
-	        }
 	}
 else if( arrowKeyPressed )
 {
 // ignore left and right arrows in list
 resp = EKeyWasConsumed;
 //
 // ---------------------------------------------------------------------------
 //
 void CMmWidgetContainer::MakeVisible(TBool aVisible)
 	{
-	if (!aVisible)
+	if ( !aVisible )
 		{
-		ASSERT(iTimer);
-		TRAP_IGNORE( iTimer->StopL( EFalse ) );
 		RestoreWidgetPosition();
 		CacheWidgetPosition();
 		iDrawer->RemoveFloatingItems();
 		}
-	else if (aVisible)
+	else if ( aVisible )
 		{
 		RestoreWidgetPosition();
 		}
 	CCoeControl::MakeVisible(aVisible);
 	iWidget->MakeVisible(aVisible);
+	if ( !aVisible )
+{
+SetHighlightVisibilityL( EFalse );
+}
 	}
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
 void CMmWidgetContainer::HandleNumberOfItemsChangedL( TItemsChangeType aChange )
 	{
-	ASSERT(iTimer);
+	SetHighlightVisibilityL( EFalse );
-	iTimer->StopL();
 	if ( aChange == EItemsAdded )
 		{
 		HandleItemAdditionL();
 		}
 	else if ( aChange == EItemsRemoved )
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 //
-TBool CMmWidgetContainer::IsTimerActive( TInt aItemIndex )
-	{
-	ASSERT(iTimer);
-	TBool timerActive = iTimer->IsActive();
-	if ( aItemIndex >= 0 && timerActive )
-		{
-		timerActive = ( aItemIndex == iTimer->TimerHighlightIndex() );
-		}
-	return timerActive;
-	}
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-//
 void CMmWidgetContainer::HandleLongTapEventL( const TPoint& aPenEventLocation,
 const TPoint& aPenEventScreenLocation )
 	{
 	TInt index( KErrNotFound );
 	if ( iWidget->View()->XYPosToItemIndex( aPenEventLocation, index ) )
 		{
-		ASSERT( iTimer );
+		SetHighlightVisibilityL( ETrue );
-		iTimer->ContinueL( KDelayInfinite );
 	    iLongTapInProgress = ETrue;
 		if ( iLongTapObserver )
 			{
 			iLongTapObserver->HandleLongTapEventL( aPenEventScreenLocation );
 			}
 	if ( iLongTapInProgress )
 		{
 		iLongTapInProgress = EFalse;
 		if( aStopTimer )
 			{
-			ASSERT( iTimer );
+			SetHighlightVisibilityL( EFalse );
-			iTimer->StopL();
 			}
 		}
 	}
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 //
 void CMmWidgetContainer::HandleListBoxEventL( CEikListBox* aListBox,
 TListBoxEvent aEventType )
 {
-ASSERT( iTimer );
 //    handle same behaviour in edit mode and normal mode
 switch ( aEventType )
 		{
 		case MEikListBoxObserver::EEventPenDownOnItem:
 			{
 			iDragOccured = EFalse;
 			if ( !iLongTapInProgress )
 				{
-				iTimer->StartL( KDelayInfinite );
+				SetHighlightVisibilityL( ETrue );
 				}
 			break;
 			}
 		case MEikListBoxObserver::EEventItemSingleClicked:
 			{
 			if ( !iDragOccured && !iLongTapInProgress )
 				{
 				SetHighlightL( Widget()->CurrentItemIndex() );
-				iTimer->StopL( ETrue );
+				SetHighlightVisibilityL( EFalse );
 				}
 			iDragOccured = EFalse;
 			break;
 			}
 		case MEikListBoxObserver::EEventItemDraggingActioned:
 			{
-			iTimer->StopL();
+			SetHighlightVisibilityL( EFalse );
 			iDragOccured = ETrue;
 			break;
 			}
 		case MEikListBoxObserver::EEventPanningStarted:
 		case MEikListBoxObserver::EEventPanningStopped:
 		case MEikListBoxObserver::EEventFlickStarted:
 		case MEikListBoxObserver::EEventFlickStopped:
 			{
-			iTimer->StopL( EFalse );
+			SetHighlightVisibilityL( EFalse );
 			break;
 			}
 		}
 //    handle different behaviour in edit mode and normal mode
 iListBoxObserver->HandleListBoxEventL( aListBox, aEventType );
 }
 }
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMmWidgetContainer::HandleOptionsMenuVisibilityChangeL(
-		TBool aOptionsMenuVisible )
-	{
-	if ( IsTimerActive() )
-		{
-		TInt delay = (aOptionsMenuVisible) ? KDelayInfinite : KDelayInSeconds6;
-		iTimer->StartL( delay, EFalse );
-		}
-	}
 //End of file

changeset 4	4d54b72983ae
parent 2	08c6ee43b396
child 5	c743ef5928ba