FCL/sf/app/photos: comparison photosgallery/viewframework/views/cloudview/src/glxcloudviewcontrol.cpp

equal deleted inserted replaced

-:71da52165949
+:ce1c7ad1f18b
 // ---------------------------------------------------------------------------
 //
 void CGlxCloudViewControl::VisualLayoutUpdated(CAlfVisual &/* aVisual*/)
 {
 TRACER("GLX_CLOUD::CGlxCloudViewControl::VisualLayoutUpdated");
+	//If the grid is already shown , disable it
+if(iTagsContextMenuControl->ItemMenuVisibility())
+{
+iTagsContextMenuControl->ShowItemMenu(EFalse);
+}
 TRect rect;
 AknLayoutUtils::LayoutMetricsRect (AknLayoutUtils::EMainPane, rect);
 if ((rect.Width() != (iTagScreenWidth + iScrollPaneHandle.iW + KRightmargin)) || (rect.Height() != iScreenHeight))
 {
 //set the new screen dimensions
 iCloudInfo.Close ();
 iLabels.Close();
 iMediaList.RemoveContext (iAttributeContext);
 iMediaList.RemoveMediaListObserver (this);
 delete iAttributeContext;
-/*if ( iBubbleContainer )
-		{
-		iBubbleContainer->SetHost (NULL);
-		delete iBubbleContainer;
-		}*/
 if ( iUiUtility )
 {
 iUiUtility->Close ();
 }
 if ( iLabels.Count()-1 >= iMediaList.FocusIndex())
 {
 //to highlight focused element
 SetFocusColor();
-//CalculateBubleMidPoint ();
 }
 }
 // ---------------------------------------------------------------------------
 //
 void CGlxCloudViewControl::FetchAttributeFromCacheL()
 {
 TRACER("GLX_CLOUD::CGlxCloudViewControl::FetchAttributeFromCacheL");
 GLX_LOG_INFO("GLX_CLOUD ::CGlxCloudViewControl::FetchAttributeFromCache MediaList already filled" );
-//enable msk as the medialist is populated
-//iObserver.HandleMskChangedL (ETrue);
 iLayoutObserver.HandleLayoutChanged();
 if ( iLabels.Count ()==0)
 {
 for (TInt i=0; i<iMediaList.Count();i++)
 {
 // no shadow wanted for the text
 iEmptyString->EnableShadow( EFalse );
 //disable msk
 iLayoutObserver.HandleLayoutChanged();
-//iObserver.HandleMskChangedL (EFalse);
 iScrollEventData.mSpan = 0;
 iScrollEventData.mViewLength = 0;
 DisplayScrollBar();
 GLX_LOG_INFO1("GLX_CLOUD ::CGlxCloudViewControl::DisplayEmptyCloudView layout Count after reset  %d ", iLayout->Count());
 }
 // CreateBubleContainer()
 // ---------------------------------------------------------------------------
 //
 void CGlxCloudViewControl::CreateBubleContainer()
 {
-/* if ( !iBubbleContainer)
-{
-TRAPD(err1,
-{
-iBubbleContainer = CGlxContainerInfoBubble::NewL (&iMediaList,
-CGlxCloudViewControl::Env (), *this);
-});
-;
-if ( err1!= KErrNone)
-{
-GLX_LOG_INFO1("GLX_CLOUD::CGlxCloudViewControl::LayoutVisibleArea - Error (%d)", err1);
-}
-iBubbleContainer->SetHost (this);
-}*/
 }
 // ---------------------------------------------------------------------------
 // MoveUpIfRequired()
 // ---------------------------------------------------------------------------
 iViewPortPosition.iY = iViewPortVirtualSize.iHeight - iViewPortSize.iHeight;
 }
 iViewPortLayout->SetViewportPos(iViewPortPosition, KSlowCloudMovement);
 iScrollEventData.mViewStartPos = iViewPortPosition.iY;
 Scroll();
-//CalculateBubleMidPoint ();
 }
 // ---------------------------------------------------------------------------
 // MoveDownIfRequired()
 iScrollEventData.mViewStartPos = iViewPortPosition.iY;
 if(iScrollBarWidget)
 {
 Scroll();
 }
-//CalculateBubleMidPoint();
 }
 // ---------------------------------------------------------------------------
 // MoveDownIfRequired()
 // ---------------------------------------------------------------------------
 midpoint.iX+=anchorRect.iX;
 midpoint.iY+=anchorRect.iY;
 //Substract from the viewport position the viewport position
 SetBubleMidPoint(midpoint);
-//Set the buble focus
-// iBubbleContainer->SetFocus (midpoint);
 }
 // ---------------------------------------------------------------------------
 // HandlePointerEventL()
 // ---------------------------------------------------------------------------
 {
 TRACER("GLX_CLOUD::CGlxCloudViewControl::HandlePointerEventL");
 CAlfVisual* tappedvisual = aEvent.Visual();
 TBool consumed = EFalse;
 if(aEvent.PointerEvent().iType == TPointerEvent::EButton1Down)
 {
+iDownEventReceived = EFalse;
 //reset variables & Physics simulator
 iPhysics->StopPhysics();
 iPhysics->ResetFriction();
 iDragging = EFalse;
 iPhysicsStarted = EFalse;
 EAlfPointerEventReportDrag + EAlfPointerEventReportLongTap
 + EAlfPointerEventReportUnhandled, *this);
 Display()->Roster().DisableLongTapEventsWhenDragging(*this);
 //If the grid is already shown , disable it
-iTagsContextMenuControl->ShowItemMenu(EFalse);
+if(iTagsContextMenuControl->ItemMenuVisibility())
+{
+iDownEventReceived = ETrue;
+iTagsContextMenuControl->ShowItemMenu(EFalse);
+return ETrue;
+}
 if(tappedvisual)
 {
 for(TInt index=0;index<iLayout->Count();index++)
 {
 CAlfVisual* layoutvisual = &(iLayout->Visual(index));
 break;
 }
 }
 }
 }
+else if(iDownEventReceived)
+{
+consumed = ETrue;
+}
 else if (aEvent.PointerEvent().iType == TPointerEvent::EDrag)
 {
 GLX_LOG_INFO("GLX_CLOUD :: CGlxCloudViewControl::HandlePointerEventL(EDrag) event");
 iTouchFeedback->InstantFeedback(ETouchFeedbackBasic);
 }
 //Check if dragging actually happened using iViewDragged
 if (iDragging && iViewDragged)
 {
+			iTimer->Cancel ();//cancels any outstanding requests
 iDragging = EFalse;
 TPoint drag = iStart - aEvent.PointerEvent().iPosition;
 iPhysics->StartPhysics(drag, iStartTime);
 iPhysicsStarted = ETrue;
-iTimer->Cancel ();//cancels any outstanding requests
 }
 //If dragging not happened consider it as Tapped event
 //When it recognises the long press event ,  and if up event is received..Ignore it
 else if (tappedvisual && !iViewDragged && !iTimerComplete)
 {
 //If found that possibly in next move it might go out of bounds, start physics
 //emulation
 if (iPhysicsStarted && iDragging)
 {
+iTimer->Cancel();
 TPoint drag = iStart - aPointerEvent.iPosition;
 iPhysics->StartPhysics(drag, iStartTime);
 iDragging = EFalse;
 }
 {
 switch(aEvent.CustomParameter())
 {
 case KAlfActionIdDeviceLayoutChanged:
 {
-// iObserver.HandleMskChangedL(ETrue);
 iLayoutObserver.HandleLayoutChanged();
 TRAP_IGNORE(UpdateLayoutL());
 }
 return EEventNotHandled;

branch	RCL_3
changeset 14	ce1c7ad1f18b
parent 9	6b87b143d312
child 22	2dac0fdba72b