modify resetTouchInfo, remove elm_shutdown, fix prevent

Change-Id: I7c8503ff32ceb6739be068976582b50b13ad2ed3

diff --git a/src/ui/FUi_ControlManager.cpp b/src/ui/FUi_ControlManager.cpp
old mode 100755 (executable)
new mode 100644 (file)
index b0a94af..1a04b30
--- a/src/ui/FUi_ControlManager.cpp
+++ b/src/ui/FUi_ControlManager.cpp
@@ -160,8 +160,6 @@ _ControlManager::Initialize(void)
        SysLog(NID_UI, "The initial value of device orientation is %d.", degree);
 
        __pInstance->__screenRotation = ::Convert(degree);
-
-       elm_init(0, null);
 }
 
 void
@@ -172,8 +170,6 @@ _ControlManager::Release(void)
 
        delete __pInstance;
        __pInstance = null;
-
-       elm_shutdown();
 }
 
 _ControlManager*

diff --git a/src/ui/FUi_EflUiEventManager.cpp b/src/ui/FUi_EflUiEventManager.cpp
index 0523ea0..9429934 100644 (file)
--- a/src/ui/FUi_EflUiEventManager.cpp
+++ b/src/ui/FUi_EflUiEventManager.cpp
@@ -534,7 +534,7 @@ public:
                        {
                                pTouchManager->ResetTouchInfo();
                                SysLog(NID_UI, "ResetTouchInfo x(%d), y(%d), deviceID(%d), pointID(%d)", current.x, current.y, deviceId, pointId);
-                               ClearLastResult();
+                               SysTryReturnVoidResult(NID_UI, false, E_SYSTEM, "[E_SYSTEM] A system error occurred.");
                        }
                        else
                        {
@@ -609,13 +609,17 @@ private:
                                        pControl = pCapturedControl;
                                }
 
-                               Tizen::Graphics::Rectangle ownerRc((dynamic_cast<_Window*>(pCapturedControl)->GetOwner())->GetAbsoluteBounds());
-                               if ((x >= ownerRc.x) && (x <= (ownerRc.x + ownerRc.width)) && (y >= ownerRc.y) && (y <= (ownerRc.y + ownerRc.height)))
+                               _Window * pWindow = dynamic_cast<_Window*>(pCapturedControl);
+                               if (pWindow)
                                {
-                                       _Window * pWindow = dynamic_cast<_Window*>(pCapturedControl);
-                                       if (pWindow)
+                                       _Control* pOwner = pWindow->GetOwner();
+                                       if (pOwner)
                                        {
-                                               pControl = pWindow->GetOwner();
+                                               Tizen::Graphics::Rectangle ownerRc(pOwner->GetAbsoluteBounds());
+                                               if ((x >= ownerRc.x) && (x <= (ownerRc.x + ownerRc.width)) && (y >= ownerRc.y) && (y <= (ownerRc.y + ownerRc.height)))
+                                               {
+                                                       pControl = pOwner;
+                                               }
                                        }
                                }