modify DoublePressed Calling sequence, add pointId log, remove unnecessary codes

Change-Id: I0be5278f1c93457753f357a3c3a9e74e7f94b69c

diff --git a/src/ui/FUi_ControlImpl.cpp b/src/ui/FUi_ControlImpl.cpp
index cf62ba5..37dc4c1 100644 (file)
--- a/src/ui/FUi_ControlImpl.cpp
+++ b/src/ui/FUi_ControlImpl.cpp
@@ -984,7 +984,7 @@ public:
                                                SysTryReturn(NID_UI, __impl.__pCoreTouchEvent, false, E_SYSTEM, "[E_SYSTEM] System error occurred.");
                                                isFiltered = __impl.__pCoreTouchEvent->ProcessListener(touchInfo);
 
-                                               return true;
+                                               return false;
                                        }
                                }
                        }
@@ -1395,25 +1395,25 @@ public:
 
                        Control& control = static_cast<Control&>(pControlImpl->GetPublic());
 
-                               TouchEventInfo publicTouchInfo;
+                       TouchEventInfo publicTouchInfo;
 
-                               _TouchEventArg* pEventArg = GetTouchEventArgN(touchInfo);
+                       _TouchEventArg* pEventArg = GetTouchEventArgN(touchInfo);
                        SysTryReturn(NID_UI, pEventArg, false, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory shortage.");
 
-                               publicTouchInfo.Construct(*pEventArg);
+                       publicTouchInfo.Construct(*pEventArg);
 
-                               if (pEventArg)
-                               {
-                                       delete pEventArg;
-                                       pEventArg = null;
-                               }
+                       if (pEventArg)
+                       {
+                               delete pEventArg;
+                               pEventArg = null;
+                       }
 
                        isFiltered = __impl.__pPublicPropagatedTouchEventListener->OnTouchReleased(control, publicTouchInfo);
-                               if (isFiltered)
-                               {
-                                       return true;
-                               }
+                       if (isFiltered)
+                       {
+                               return true;
                        }
+               }
 
                return __impl.CallOnTouchReleased(source, touchInfo);
        }
@@ -2913,16 +2913,6 @@ _ControlImpl::CallOnTouchPressed(const _Control& source, const _TouchInfo& touch
 
        GetCore().SetEventEnableState(true);
 
-       LinkedListT <Tizen::Base::Runtime::IEventListener*>* pList = GetTouchEventListener();
-       if (pList && (pList->GetCount() > 0) && (&source == &GetCore()))
-       {
-               bool returnValue = __pCoreTouchEvent->ProcessDoublePress(touchinfo, isFiltered);
-               if (returnValue)
-               {
-                       return false;
-               }
-       }
-
        if (&source == &GetCore())
        {
                isFiltered = __pCoreTouchEvent->ProcessListener(touchinfo);
@@ -2931,6 +2921,12 @@ _ControlImpl::CallOnTouchPressed(const _Control& source, const _TouchInfo& touch
                        return true;
                }
 
+               LinkedListT <Tizen::Base::Runtime::IEventListener*>* pList = GetTouchEventListener();
+               if (pList && (pList->GetCount() > 0))
+               {
+                       __pCoreTouchEvent->ProcessDoublePress(touchinfo, isFiltered);
+               }
+
                __pCoreTouchEvent->ProcessDragListener(touchinfo);
        }
 

diff --git a/src/ui/FUi_EflUiEventManager.cpp b/src/ui/FUi_EflUiEventManager.cpp
index 0811901..b33770b 100644 (file)
--- a/src/ui/FUi_EflUiEventManager.cpp
+++ b/src/ui/FUi_EflUiEventManager.cpp
@@ -435,40 +435,6 @@ public:
                return pControlManager->GetObject(controlHandle);
        }
 
-       result AddParentControl(int pointId, const _ControlHandle& controlHandle)
-       {
-               bool exist = false;
-               result r = E_SUCCESS;
-
-               __pParentTargetMap->ContainsKey(pointId, exist);
-
-               if (exist)
-               {
-                       r = __pParentTargetMap->Remove(pointId);
-                       SysTryReturnResult(NID_UI, r == E_SUCCESS, E_SYSTEM, "[E_SYSTEM] A system error occurred.");
-               }
-
-               r = __pParentTargetMap->Add(pointId, controlHandle);
-               SysTryReturnResult(NID_UI, r == E_SUCCESS, E_SYSTEM, "[E_SYSTEM] A system error occurred.");
-
-               return r;
-       }
-
-       _Control* GetParentControl(int pointId)
-       {
-               SysTryReturn(NID_UI, __pParentTargetMap, null, E_SYSTEM, "[E_SYSTEM] A system error occurred.");
-
-               _ControlHandle controlHandle;
-
-               __pParentTargetMap->GetValue(pointId, controlHandle);
-
-               _ControlManager* pControlManager = _ControlManager::GetInstance();
-               result r = GetLastResult();
-               SysTryReturn(NID_UI, pControlManager, null, r, "[%s] Propagating.", GetErrorMessage(r));
-
-               return pControlManager->GetObject(controlHandle);
-       }
-
 private:
        _TouchEventManager(void)
        {
@@ -481,14 +447,6 @@ private:
 
                __pTargetMap = move(pTargetMap);
 
-               unique_ptr<HashMapT<int, _ControlHandle> > pParentTargetMap(new (std::nothrow) HashMapT<int, _ControlHandle>);
-               SysTryReturnVoidResult(NID_UI, pParentTargetMap, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory is insufficient.");
-
-               r = pParentTargetMap->Construct();
-               SysTryReturnVoidResult(NID_UI, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
-
-               __pParentTargetMap = move(pParentTargetMap);
-
                SetLastResult(E_SUCCESS);
        }
 
@@ -502,7 +460,6 @@ private:
 private:
        static _TouchEventManager* __pInstance;
        unique_ptr<HashMapT<int, _ControlHandle> > __pTargetMap;
-       unique_ptr<HashMapT<int, _ControlHandle> > __pParentTargetMap;
 };
 
 _TouchEventManager* _TouchEventManager::__pInstance = null;
@@ -551,12 +508,18 @@ public:
                        delete pFingerInfoList;
 
                        pointId = pTouchManager->GeneratePointId(deviceId);
+                       SysSecureLog(NID_UI, "OnTouchPressed GeneratePointId = pointId %d", pointId);
                }
                else
                {
                        pointId = pTouchManager->GetPointId(deviceId);
                }
 
+               if (status == _TOUCH_RELEASED)
+               {
+                       SysSecureLog(NID_UI, "OnTouchReleased GetPointId = pointId %d", pointId);
+               }
+
                if (pointId == INVALID_POINT_ID)
                {
                        if (status == _TOUCH_RELEASED)
@@ -606,13 +569,6 @@ public:
                        {
                                r = __pTouchEventManager->AddControl(pointId, pControl->GetHandle());
                                SysTryReturnVoidResult(NID_UI, r == E_SUCCESS, E_SYSTEM, "[E_SYSTEM] A system error occurred.");
-
-                               _Control* pParent = pControl->GetParent();
-                               if (pParent)
-                               {
-                                       r = __pTouchEventManager->AddParentControl(pointId, pParent->GetHandle());
-                                       SysTryReturnVoidResult(NID_UI, r == E_SUCCESS, E_SYSTEM, "[E_SYSTEM] A system error occurred.");
-                               }
                        }
                }
                else
@@ -929,13 +885,6 @@ public:
                        {
                                r = __pTouchEventManager->AddControl(pointId, pControl->GetHandle());
                                SysTryReturnVoidResult(NID_UI, r == E_SUCCESS, E_SYSTEM, "[E_SYSTEM] A system error occurred.");
-
-                               _Control* pParent = pControl->GetParent();
-                               if (pParent)
-                               {
-                                       r = __pTouchEventManager->AddParentControl(pointId, pParent->GetHandle());
-                                       SysTryReturnVoidResult(NID_UI, r == E_SUCCESS, E_SYSTEM, "[E_SYSTEM] A system error occurred.");
-                               }
                        }
                }
                else
@@ -1334,16 +1283,16 @@ OnTouchReleased(void* pData __UNUSED__, int type __UNUSED__, void* pEventInfo)
 
        if (pEv->buttons == _MOUSE_BUTTON_LEFT || pEv->buttons == _MOUSE_BUTTON_NONE)
        {
-       _TouchEvent event(pEv->multi.device, _TOUCH_RELEASED, pEv->root.x, pEv->root.y, pEv->timestamp, null);
+               _TouchEvent event(pEv->multi.device, _TOUCH_RELEASED, pEv->root.x, pEv->root.y, pEv->timestamp, null);
 
-       result r = GetLastResult();
-       if (r!= E_SUCCESS)
-       {
-               SysLog(NID_UI, "[%s] Propagating.", GetErrorMessage(r));
-               return ECORE_CALLBACK_PASS_ON;
-       }
+               result r = GetLastResult();
+               if (r!= E_SUCCESS)
+               {
+                       SysLog(NID_UI, "[%s] Propagating.", GetErrorMessage(r));
+                       return ECORE_CALLBACK_PASS_ON;
+               }
 
-       event.Send();
+               event.Send();
        }
        else
        {

diff --git a/src/ui/FUi_UiTouchEvent.cpp b/src/ui/FUi_UiTouchEvent.cpp
index 2d0cbf0..f7fe361 100644 (file)
--- a/src/ui/FUi_UiTouchEvent.cpp
+++ b/src/ui/FUi_UiTouchEvent.cpp
@@ -450,7 +450,7 @@ _UiTouchEvent::OnEventHandled(const _Control& control)
 }
 
 result
-_UiTouchEvent::FireListener(const _ITouchEventListener* pListener, const _Control* pControl,  bool isTouchEvent, bool& isFiltered)
+_UiTouchEvent::FireListener(const _ITouchEventListener* pListener, const _Control* pControl, bool isTouchEvent, bool& isFiltered)
 {
        _ITouchEventListener* pTouchEventListener = const_cast <_ITouchEventListener*>(pListener);
        SysTryReturn(NID_UI, pTouchEventListener, E_SYSTEM, E_SYSTEM, "[E_SYSTEM] System error occurred.");
@@ -468,8 +468,7 @@ _UiTouchEvent::FireListener(const _ITouchEventListener* pListener, const _Contro
                pTouchManager->ResetTouchInfo();
 
                return E_SUCCESS;
-
-}
+       }
 
        if (ResetTouchInfo(pTarget, *pTouchInfo) == E_SUCCESS)
        {