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

equal deleted inserted replaced

-:137ebc85284b
+:1b758917cafc
 * Nokia Corporation - initial contribution.
 *
 * Contributors:
 *
 * Description:
-*  Version     : %version: MM_71.1.17.1.65 % << Don't touch! Updated by Synergy at check-out.
+*  Version     : %version: MM_71.1.17.1.70 % << Don't touch! Updated by Synergy at check-out.
 *
 */
 #include <e32keys.h>
 #include <e32math.h>
 // -----------------------------------------------------------------------------
 //
 CMmWidgetContainer::CMmWidgetContainer()
 : iMarqueeAdapter( NULL )
 , iLongTapInProgress( EFalse )
+, iDragOccured( EFalse )
 , iBgContext( NULL )
 , iIsFaded( EFalse )
 , iHasFocus( ETrue )
 , iInForeground( ETrue )
 , iLongTapDetector( NULL )
 {
 iLongTapDetector->EnableLongTapAnimation( aEnable );
 // cancel longTap timer, avoid showing popupmenu
 if( !aEnable )
 {
-iLongTapDetector->PointerEventL( TPointerEvent() );
+TRAP_IGNORE( iLongTapDetector->PointerEventL( TPointerEvent() ) );
 }
 }
 }
 // -----------------------------------------------------------------------------
 {
 iTapPoint = aPointerEvent.iPosition;
 iLastDragPoint = aPointerEvent.iPosition;
 iLastDragHighlight = GetHighlight();
 if( !iWidget->View()->XYPosToItemIndex(
 aPointerEvent.iPosition, iDraggedIndex ) )
 {
 iDraggedIndex = KErrNotFound;
 }
 iItemRelativeTapPoint = aPointerEvent.iPosition - iWidget->View()->ItemPos(
 iDraggedIndex );
 if( !iIsFaded && iDialogOpened)
 {
 iDialogOpened = EFalse;
 if(highlightVisibleBefore != iHighlightVisibleBeforeLongTap)
 {
-SetHighlightVisibilityL( iHighlightVisibleBeforeLongTap);
+TRAP_IGNORE( SetHighlightVisibilityL( iHighlightVisibleBeforeLongTap) );
 }
 highlightVisibleBefore = iHighlightVisibleBeforeLongTap;
 }
 CCoeControl::HandleResourceChange( aType );
 if( iLastDragHighlight != highlight )
 {
 iDragAndDropObserver->HandleDragOverL( GetHighlight() );
 }
+TPoint centerPoint( aPointerEvent.iPosition );
+if( WidgetType() == EGridWidget )
+{ // move item's TL corner by half width/height to center item horizontally.
+centerPoint.iX -= ( iWidget->View()->ItemSize( highlight ).iWidth / 2 );
+centerPoint.iY -= ( iWidget->View()->ItemSize( highlight ).iHeight / 2 );
+}
+else
+{ // move item's T of corner by relative tap point to align left horizontally.
+centerPoint.iX -= iItemRelativeTapPoint.iX;
+// move item's L of corner by half height to center item horizontally.
+centerPoint.iY -= ( iWidget->View()->ItemSize( highlight ).iHeight / 2 );
+}
 if( !tooFast )
 {
 TSize itemSize = iWidget->View()->ItemSize( highlight );
 TPoint itemPos = iWidget->View()->ItemPos( highlight );
 if ( PointInItemReorderAreaL( highlight, aPointerEvent.iPosition ) )
-{
-CHnSuiteModel* model = GetMmModel()->GetSuiteModel();
-CHnItemModel* onItemModel = model->GetItemModel( model->IdByIndex( highlight ));
-if (iDrawer->GetAnimator()->IsReadyForNewAnimation() && !aAbortAnimation
-&& onItemModel->GetItemType() != EItemTypeParentFolder
-&& iDraggedIndex != highlight)
 {
-GetMmModel()->ReorderModelL( iDraggedIndex, highlight );
+CHnSuiteModel* model = GetMmModel()->GetSuiteModel();
-AnimateShiftL( highlight );
+CHnItemModel* onItemModel = model->GetItemModel( model->IdByIndex( highlight ));
-iDrawer->SetDraggedIndexL( highlight,
+if( iDrawer->GetAnimator()->IsReadyForNewAnimation() && !aAbortAnimation
-aPointerEvent.iPosition - iItemRelativeTapPoint );
+&& onItemModel->GetItemType() != EItemTypeParentFolder
-iDraggedIndex = highlight;
+&& iDraggedIndex != highlight )
-iDragAndDropObserver->HandleDraggedIndexUpdatedL( highlight );
+{
+GetMmModel()->ReorderModelL( iDraggedIndex, highlight );
+AnimateShiftL( highlight );
+iDrawer->SetDraggedIndexL( highlight, centerPoint );
+iDraggedIndex = highlight;
+iDragAndDropObserver->HandleDraggedIndexUpdatedL( highlight );
+}
 }
 }
-}
-if ( DeltaSquare( iTapPoint, aPointerEvent.iPosition ) > KDragDelta &&
-!iDrawer->IsDraggable() )
+if ( DeltaSquare( iTapPoint, aPointerEvent.iPosition ) > KDragDelta
-{
+&& !iDrawer->IsDraggable() )
-iDrawer->SetDraggedIndexL( iDraggedIndex, iTapPoint - iItemRelativeTapPoint );
+{
+if( !tooFast )
+{
+iDrawer->AnimateDragItemStartL( iDraggedIndex, centerPoint );
+}
+iDrawer->SetDraggedIndexL( iDraggedIndex, centerPoint );
 iDrawer->SetDraggableL( ETrue );
 }
 else if( iDrawer->IsDraggable() )
 {
-iDrawer->SetDraggedPointL( aPointerEvent.iPosition - iItemRelativeTapPoint );
+iDrawer->SetDraggedPointL( centerPoint );
 }
 DEBUG(("\t_Mm_:CMmWidgetContainer::HandleDragL: iLastDragHighlight = %d ", iLastDragHighlight ));
 DEBUG(("\t_Mm_:CMmWidgetContainer::HandleDragL: highlight = %d ", highlight ));
 iLastDragPoint = aPointerEvent.iPosition;
 iDraggedIndex = -1;
 iDrawer->SetDraggedIndexL( iDraggedIndex, TPoint( 0, 0 ) );
 SetDraggableL( EFalse );
-TInt dragFloatingItem;
+TInt dragFloatingItem( KErrNotFound );
+TInt dragStartFloatingItem( KErrNotFound );
 do
 {
 dragFloatingItem = iDrawer->GetFloatingItemIndex( EDrag );
 iDrawer->RemoveFloatingItem( dragFloatingItem );
-}
+dragStartFloatingItem = iDrawer->GetFloatingItemIndex( EDragStart );
-while( dragFloatingItem != KErrNotFound );
+iDrawer->RemoveFloatingItem( dragStartFloatingItem );
+}
+while( dragFloatingItem != KErrNotFound || dragStartFloatingItem != KErrNotFound);
 }
 // -----------------------------------------------------------------------------
 //
 //
 TBool CMmWidgetContainer::IsNoItemDragged()
 {
 TBool noItemDragged = EFalse;
 noItemDragged = ( KErrNotFound == iDraggedIndex ) ? ETrue : noItemDragged;
 CHnSuiteModel* model = GetMmModel()->GetSuiteModel();
 if( !noItemDragged && model )
 {
 CHnItemModel* onItemModel = model->GetItemModel( model->IdByIndex( iDraggedIndex ));
 if( onItemModel )
 {
 noItemDragged = ( onItemModel->GetItemType() == EItemTypeParentFolder );
 }
 }
 return noItemDragged;
 }
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 //
-TBool CMmWidgetContainer::IsDeleteLockedL( TInt aItemIndex )
+TMmWidgetPosition CMmWidgetContainer::WidgetPositionCache() const
+{
+return iWidgetPositionCache;
+}
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+TBool CMmWidgetContainer::IsDeleteLocked( TInt aItemIndex )
 {
 TBool result = ETrue;
 CHnSuiteModel* model = GetMmModel()->GetSuiteModel();
 if( model )
 if( !isAnimated )
 {
 if( GetHighlight() != iDraggedIndex
 && IsFolderL( GetHighlight() )
-&& !IsDeleteLockedL( GetHighlight() )
+&& !IsDeleteLocked( GetHighlight() )
 && iDrawer->IsDraggable() )
 {
 iDrawer->AnimateItemZoomInL( GetHighlight() );
 }
 }
 ManageFolderZoomingL( draggedItemOverIcons );
 HandleDragL( pointerEvent, aAbortAnimations );
 }
-else if (aPointerEvent.iType == TPointerEvent::EButton1Up && iDrawer->IsDraggable())
+else if( aPointerEvent.iType == TPointerEvent::EButton1Up && iDrawer->IsDraggable() )
 {
 if( !draggedItemOverIcons )
 {
 SetManualHighlightL( iDraggedIndex );
 }
 longTapPointerEvent.iType = TPointerEvent::EDrag;
 }
 iLongTapDetector->PointerEventL( longTapPointerEvent );
 }
-CCoeControl::HandlePointerEventL( aPointerEvent );
 if ( aPointerEvent.iType == TPointerEvent::EButton1Down
 && itemExists  )
 {
 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 ))
 {
 if( itemExists )
 {
 }
 }
 }
 else
 {
+iDragOccured = ETrue;
 SetHighlightVisibilityL( EFalse );
 }
 }
+CCoeControl::HandlePointerEventL( aPointerEvent );
 TInt lastTopItemIndex = Widget()->TopItemIndex();
 TBool abortAnimation = lastTopItemIndex != Widget()->TopItemIndex();
 //
 // -----------------------------------------------------------------------------
 //
 EXPORT_C void CMmWidgetContainer::SetHighlightVisibilityL( TBool aEnable )
 {
-// activate the model
-CHnSuiteModel* suiteModel = GetMmModel()->GetSuiteModel();
-if( suiteModel )
-{
-suiteModel->SetActiveL( aEnable );
-}
 if( ( !!aEnable != !!iPreviousHighlightVisibility ) // Ex-OR
 || ( !!aEnable != !!IsHighlightVisible() ) ) // Ex-OR
 {
 #ifdef RD_UI_TRANSITION_EFFECTS_LIST
 MAknListBoxTfxInternal *transApi = CAknListLoader::TfxApiInternal(
 {
 iWidget->View()->ItemDrawer()->ClearFlags(
 CListItemDrawer::ESingleClickDisabledHighlight );
 }
-if( IsVisible() )
+if( IsVisible() && !aEnable )
 {
 TInt highlight = GetHighlight();
 CListBoxView* view = Widget()->View();
 Widget()->DrawNow( TRect( view->ItemPos( highlight ),
 view->ItemSize( highlight ) ) );
 //
 void CMmWidgetContainer::CancelDragL()
 {
 if( iIsEditMode && iDrawer )
 {
-if( iDrawer->GetFloatingItemIndex( EDrag ) != KErrNotFound )
+if( iDrawer->GetFloatingItemIndex( EDrag ) != KErrNotFound
+|| iDrawer->GetFloatingItemIndex( EDragStart ) != KErrNotFound )
 {
 CancelDragL( EFalse );
 }
 }
 }
 - iWidget->TopItemIndex() / ColumnsInCurrentView() ) <= 1 )
 {
 return;
 }
 TBool needToScrollUp =
 GetHighlight() - iWidget->TopItemIndex() < ColumnsInCurrentView()
 && iWidget->TopItemIndex() != 0;
 TBool needToScrollDown =
 iWidget->BottomItemIndex() - GetHighlight() < ColumnsInCurrentView()
 && iWidget->BottomItemIndex() / ColumnsInCurrentView()
 != ( NumberOfItems() - 1 )  / ColumnsInCurrentView();
 if( WidgetType() == EGridWidget )
 {
 // TODO: temporary - invisible partial items in MCL grid :/
 needToScrollDown =
 iWidget->BottomItemIndex() - ColumnsInCurrentView() - GetHighlight() < ColumnsInCurrentView()
 && ( iWidget->BottomItemIndex() / ColumnsInCurrentView() ) - 1
 != ( NumberOfItems() - 1 ) / ColumnsInCurrentView()
 && iWidget->BottomItemIndex() - iWidget->TopItemIndex()
 > ColumnsInCurrentView() * RowsInCurrentView();
 }
 if( needToScrollUp )
 {
 #ifdef RD_UI_TRANSITION_EFFECTS_LIST
 MAknListBoxTfxInternal *transApi = CAknListLoader::TfxApiInternal( iDrawer->Gc() );
 if( transApi )
 {
 transApi->SetMoveType( MAknListBoxTfxInternal::EListScrollUp );
 }
 #endif
 iDrawer->RemoveFloatingItems();
 iWidget->View()->VScrollTo(
 iWidget->TopItemIndex() - ColumnsInCurrentView() );
 #ifdef RD_UI_TRANSITION_EFFECTS_LIST
 if( transApi )
 {
 transApi->Draw( Rect() );
 }
 }
 else if( needToScrollDown )
 {
 #ifdef RD_UI_TRANSITION_EFFECTS_LIST
 MAknListBoxTfxInternal *transApi = CAknListLoader::TfxApiInternal( iDrawer->Gc() );
 if( transApi )
 {
 transApi->SetMoveType( MAknListBoxTfxInternal::EListScrollDown );
 }
 #endif
 iDrawer->RemoveFloatingItems();
 iWidget->View()->VScrollTo(
 iWidget->TopItemIndex() + ColumnsInCurrentView() );
 #ifdef RD_UI_TRANSITION_EFFECTS_LIST
 if( transApi )
 {
 transApi->Draw( Rect() );
 && iDraggedIndex != Widget()->CurrentItemIndex()
 && iDraggedIndex < NumberOfItems() )
 {
 TBool isFolder( EFalse );
 CHnSuiteModel* model = GetMmModel()->GetSuiteModel();
 CHnItemModel* onItemModel = model->GetItemModel(
 model->IdByIndex( Widget()->CurrentItemIndex() ));
 if( onItemModel )
 {
 isFolder = onItemModel->GetItemType() == EItemTypeParentFolder
 || onItemModel->GetItemType() == EItemTypeFolder;
 {
 //    handle same behaviour in edit mode and normal mode
 switch( aEventType )
 {
 case MEikListBoxObserver::EEventPenDownOnItem:
-case MEikListBoxObserver::EEventItemSingleClicked:
 {
 iDragOccured = EFalse;
 break;
 }
+case MEikListBoxObserver::EEventItemSingleClicked:
+break;
 case MEikListBoxObserver::EEventItemDraggingActioned:
 {
 iDragOccured = ETrue;
 break;
 }
 switch( aEventType )
 {
 case MEikListBoxObserver::EEventFlickStarted:
 case MEikListBoxObserver::EEventPanningStarted:
 {
 static_cast<CMmListBoxItemDrawer*>(
 Widget()->View()->ItemDrawer() )->
 EnableCachedDataUse( ETrue );
 break;
 }
 case MEikListBoxObserver::EEventFlickStopped:
 {
 static_cast<CMmListBoxItemDrawer*>(
 Widget()->View()->ItemDrawer() )->
 EnableCachedDataUse( EFalse );
 DrawView();
 break;
 }
 case MEikListBoxObserver::EEventPanningStopped:
 {
 static_cast<CMmListBoxItemDrawer*>(
 Widget()->View()->ItemDrawer() )->
 EnableCachedDataUse( EFalse );
 break;
 }
 }
 }
 else
 {
 break;
 }
 }
 }
-if ( aEventType == MEikListBoxObserver::EEventItemSingleClicked &&
+if ( aEventType == MEikListBoxObserver::EEventItemSingleClicked
-iListBoxObserver && !iLongTapInProgress && !iDrawer->IsDraggable() )
+&& iListBoxObserver && !iLongTapInProgress && !iDrawer->IsDraggable()
+&& !iDragOccured )
 {
 iListBoxObserver->HandleListBoxEventL( aListBox, aEventType );
 }
 }
 //End of file

branch	RCL_3
changeset 26	1b758917cafc
parent 25	137ebc85284b