Set TouchStatus for the SetTouchCanceled
authorminkyu kim <imetjade.kim@samsung.com>
Tue, 7 May 2013 14:31:43 +0000 (23:31 +0900)
committerminkyu kim <imetjade.kim@samsung.com>
Tue, 7 May 2013 14:31:43 +0000 (23:31 +0900)
Change-Id: Idc4a281ef5c6aaf3063e3b91fba90383e18deb43

src/ui/FUi_TouchManager.cpp

index f95893a..681e58b 100644 (file)
@@ -572,6 +572,10 @@ _MultiFingerInfo::SetFingerInfo(unsigned long pointId, const FloatPoint& point,
                }
                break;
 
+       case _TOUCH_CANCELED:
+               pFingerInfo->SetStatus(_TOUCH_CANCELED);
+               break;
+
        default:
                break;
        }
@@ -839,11 +843,14 @@ _TouchManager::SetTouchCanceled(_Control* pControl)
                _UiEventManager* pEventManager = _UiEventManager::GetInstance();
                SysTryReturnVoidResult(NID_UI, pEventManager, E_SYSTEM, "[E_SYSTEM] _UiEventManager does not exist.");
 
-               pEventManager->SendEvent(event);
-
                _TouchManager* pTouchManager = _TouchManager::GetInstance();
                SysTryReturnVoidResult(NID_UI, pTouchManager, E_SYSTEM, "[E_SYSTEM] _TouchManager does not exist.");
 
+               result r = pTouchManager->AddPoint(touchInfo.GetPointId(), currentPoint, _TOUCH_CANCELED);
+               SysTryReturnVoidResult(NID_UI, r == E_SUCCESS, E_SYSTEM, "[E_SYSTEM] System error occurred.");
+
+               pEventManager->SendEvent(event);
+
                IListT<_FingerInfo*>* pFingerInfoList = pTouchManager->GetMultiFingerInfoListN();
                SysTryReturnVoidResult(NID_UI, pFingerInfoList, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");