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

equal deleted inserted replaced

-:ff572dfe6d86
+:9674c1a575e9
 * Nokia Corporation - initial contribution.
 *
 * Contributors:
 *
 * Description:
-*  Version     : %version: MM_71.1.17.1.56 % << Don't touch! Updated by Synergy at check-out.
+*  Version     : %version: MM_71.1.17.1.57 % << Don't touch! Updated by Synergy at check-out.
 *
 */
 #include <e32keys.h>
 CCoeControl::HandlePointerEventL(aPointerEvent);
 if ( aPointerEvent.iType == TPointerEvent::EButton1Down
 && itemExists  )
 {
-SetHighlightL( index );
+SetHighlightL( index );///////////--
 }
 else if ( aPointerEvent.iType == TPointerEvent::EDrag
 // the line below is needed to enable edit mode in the list widget
 		  // because behaviour in the grid and list is different
 		  || (aPointerEvent.iType == TPointerEvent::EButtonRepeat && WidgetType() == EGridWidget ))
 //
 EXPORT_C void CMmWidgetContainer::SetHighlightVisibilityL( TBool aEnable )
 {
 // activate the model
 CHnSuiteModel* suiteModel = GetMmModel()->GetSuiteModel();
 if ( suiteModel )
 {
 suiteModel->SetActiveL( aEnable );
 }
 else
 {
 iWidget->View()->ItemDrawer()->ClearFlags(
 CListItemDrawer::ESingleClickDisabledHighlight );
 }
 if ( IsVisible() )
 {
 TInt highlight = GetHighlight();
 CListBoxView* view = Widget()->View();
 Widget()->DrawNow( TRect( view->ItemPos( highlight ),
 TInt numberOfItemsBefore (0);
 numberOfItemsBefore = GetMmModel()->NumberOfItems();
 GetMmModel()->SetSuiteModelL( aModel );
 TBool highlightVisibleBefore = iWidget->IsVisible() && IsHighlightVisible();
 // This needs to be in place (disabling redraw)
 // to udpate widget internal state, however to wait for
 // drawing until all highlight set matters are solved.
 if ( prevModel && aModel )
 {
 SetupWidgetLayoutL();
 }
 iWidget->MakeVisible(ETrue);
 if ( highlightVisibleBefore )
 {
 SetHighlightVisibilityL( ETrue );
 }
 {
 //    handle same behaviour in edit mode and normal mode
 switch ( aEventType )
 		{
 		case MEikListBoxObserver::EEventPenDownOnItem:
-			{
-			iDragOccured = EFalse;
-			if ( !iLongTapInProgress )
-				{
-				SetHighlightVisibilityL( ETrue );
-				}
-			break;
-			}
 		case MEikListBoxObserver::EEventItemSingleClicked:
 			{
-			if ( !iDragOccured && !iLongTapInProgress )
-				{
-				SetHighlightL( Widget()->CurrentItemIndex() );
-				SetHighlightVisibilityL( EFalse );
-				}
 			iDragOccured = EFalse;
 			break;
 			}
 		case MEikListBoxObserver::EEventItemDraggingActioned:
 			{
-			SetHighlightVisibilityL( EFalse );
 			iDragOccured = ETrue;
 			break;
 			}
-		case MEikListBoxObserver::EEventPanningStarted:
-		case MEikListBoxObserver::EEventPanningStopped:
-		case MEikListBoxObserver::EEventFlickStarted:
-		case MEikListBoxObserver::EEventFlickStopped:
-			{
-			SetHighlightVisibilityL( EFalse );
-			break;
-			}
 		}
 //    handle different behaviour in edit mode and normal mode
 	if ( !IsEditMode() )
 		{
 		switch ( aEventType )
 			{
 			case MEikListBoxObserver::EEventFlickStarted:
+			case MEikListBoxObserver::EEventPanningStarted:
 				{
 				static_cast<CMmListBoxItemDrawer*>(
 						Widget()->View()->ItemDrawer() )->
 						EnableCachedDataUse( ETrue );
 				break;
 						Widget()->View()->ItemDrawer() )->
 						EnableCachedDataUse( EFalse );
 				DrawView();
 				break;
 				}
+			case MEikListBoxObserver::EEventPanningStopped:
+				{
+				static_cast<CMmListBoxItemDrawer*>(
+						Widget()->View()->ItemDrawer() )->
+						EnableCachedDataUse( EFalse );
+				break;
+				}
 			}
 		}
 	else
 		{
 		switch ( aEventType )
 				break;
 				}
 			}
 		}
-if ( iListBoxObserver && !iLongTapInProgress && !iDrawer->IsDraggable() )
+if ( aEventType == MEikListBoxObserver::EEventItemSingleClicked &&
+iListBoxObserver && !iLongTapInProgress && !iDrawer->IsDraggable() )
 {
 iListBoxObserver->HandleListBoxEventL( aListBox, aEventType );
 }
 }
 //End of file

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