Change-Id: I3b86ce0ef79442d133954a5181e59043f338aea2
const int KEY_COUNT = 300;
const int DEVICE_COUNT = 999;
const wchar_t* KEYBOARD_INSERTED_EVENT = L"KEYBOARD_INSERTED";
const int KEY_COUNT = 300;
const int DEVICE_COUNT = 999;
const wchar_t* KEYBOARD_INSERTED_EVENT = L"KEYBOARD_INSERTED";
-bool __evasTouchPressed = false;
bool __keyPressed[KEY_COUNT] = {false,};
bool __touchPressed[DEVICE_COUNT] = {false,};
Ecore_X_Atom __keyboardExist = 0;
bool __keyPressed[KEY_COUNT] = {false,};
bool __touchPressed[DEVICE_COUNT] = {false,};
Ecore_X_Atom __keyboardExist = 0;
_IpcDataEvMouseDown *pIpc = static_cast<_IpcDataEvMouseDown*>(pEv->data);
SysTryReturnResult(NID_UI, pIpc, ECORE_CALLBACK_PASS_ON, "[E_INVALID_ARG] The argument is invalid.");
_IpcDataEvMouseDown *pIpc = static_cast<_IpcDataEvMouseDown*>(pEv->data);
SysTryReturnResult(NID_UI, pIpc, ECORE_CALLBACK_PASS_ON, "[E_INVALID_ARG] The argument is invalid.");
- if (__evasTouchPressed == true)
+ if (__touchPressed[0] == true)
{
_TouchManager* pTouchManager = _TouchManager::GetInstance();
if (pTouchManager)
{
_TouchManager* pTouchManager = _TouchManager::GetInstance();
if (pTouchManager)
pTouchManager->SetTouchCanceled(null);
SysLog(NID_UI, "pWindow is null, CancelTouch");
pTouchManager->SetTouchCanceled(null);
SysLog(NID_UI, "pWindow is null, CancelTouch");
- __evasTouchPressed = false;
+ __touchPressed[0] = false;
pTouchManager->ResetTouchInfo();
SysLog(NID_UI, "pWindow is null, ResetTouchInfo");
}
}
pTouchManager->ResetTouchInfo();
SysLog(NID_UI, "pWindow is null, ResetTouchInfo");
}
}
- __evasTouchPressed = true;
+ __touchPressed[0] = true;
SysSecureLog(NID_UI, "OnEvasTouchPressed - x(%d), y(%d)", pointX, pointY);
_TouchEvent event(0, _TOUCH_PRESSED, pointX, pointY, pIpc->timestamp, pControl);
SysSecureLog(NID_UI, "OnEvasTouchPressed - x(%d), y(%d)", pointX, pointY);
_TouchEvent event(0, _TOUCH_PRESSED, pointX, pointY, pIpc->timestamp, pControl);
_IpcDataEvMouseUp *pIpc = static_cast<_IpcDataEvMouseUp*>(pEv->data);
SysTryReturnResult(NID_UI, pIpc, ECORE_CALLBACK_PASS_ON, "[E_INVALID_ARG] The argument is invalid.");
_IpcDataEvMouseUp *pIpc = static_cast<_IpcDataEvMouseUp*>(pEv->data);
SysTryReturnResult(NID_UI, pIpc, ECORE_CALLBACK_PASS_ON, "[E_INVALID_ARG] The argument is invalid.");
- __evasTouchPressed = false;
+ __touchPressed[0] = false;
SysSecureLog(NID_UI, "OnEvasTouchReleased - x(%d), y(%d)", pointX, pointY);
_TouchEvent event(0, _TOUCH_RELEASED, pointX, pointY, pIpc->timestamp, pControl);
SysSecureLog(NID_UI, "OnEvasTouchReleased - x(%d), y(%d)", pointX, pointY);
_TouchEvent event(0, _TOUCH_RELEASED, pointX, pointY, pIpc->timestamp, pControl);
case OP_EV_MOUSE_MOVE:
if (pEv->size >= static_cast<int>(sizeof(_IpcDataEvMouseMove)))
{
case OP_EV_MOUSE_MOVE:
if (pEv->size >= static_cast<int>(sizeof(_IpcDataEvMouseMove)))
{
- if (__evasTouchPressed == false)
+ if (__touchPressed[0] == false)
{
return ECORE_CALLBACK_PASS_ON;
}
{
return ECORE_CALLBACK_PASS_ON;
}
if (pTouchManager->IsListenerOnly(touchinfo.GetPointId()) == true)
{
if (pTouchManager->IsListenerOnly(touchinfo.GetPointId()) == true)
{
+ _TouchManager* pTouchManager = _TouchManager::GetInstance();
+ if (pTouchManager)
+ {
+ if(pTouchManager->GetTouchControlSource() == &source)
+ {
+ SysLog(NID_UI, "VisibleState changed false, Call SetTouchCanceled");
+ pTouchManager->SetTouchCanceled(null);
+ }
+ }