From: minkyu kim <imetjade.kim@samsung.com>
Date: Fri, 22 Mar 2013 10:57:36 +0000 (+0900)
Subject: modify elm_init, setTouchRelease
X-Git-Tag: accepted/tizen_2.1/20130425.033138~779
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=77cf98b7e17953c0c8f99b1bce570dba978850fb;p=platform%2Fframework%2Fnative%2Fuifw.git

modify elm_init, setTouchRelease

Change-Id: Icb165c72a5ad75b947f7148f1ea61bc5e3174cc8
---

diff --git a/src/ui/FUi_Control.cpp b/src/ui/FUi_Control.cpp
old mode 100755
new mode 100644
index b5269e7..9430e2f
--- a/src/ui/FUi_Control.cpp
+++ b/src/ui/FUi_Control.cpp
@@ -2680,12 +2680,6 @@ _Control::GetInputEnableState(void) const
 void
 _Control::LockInputEvent(void)
 {
-	_TouchManager* pTouchManager = _TouchManager::GetInstance();
-	SysTryReturnVoidResult(NID_UI, pTouchManager != null, E_SYSTEM, "[E_SYSTEM] TouchManager Instance is null");
-
-	pTouchManager->SetTouchReleased();
-	ClearLastResult();
-
 	__inputLockRefCount++;
 }
 
diff --git a/src/ui/FUi_ControlManager.cpp b/src/ui/FUi_ControlManager.cpp
index 94c8525..34c2a28 100644
--- a/src/ui/FUi_ControlManager.cpp
+++ b/src/ui/FUi_ControlManager.cpp
@@ -156,6 +156,8 @@ _ControlManager::Initialize(void)
 	SysLog(NID_UI, "The initial value of device orientation is %d.", degree);
 
 	__pInstance->__screenRotation = ::Convert(degree);
+
+	elm_init(0, null);
 }
 
 void
@@ -166,6 +168,8 @@ _ControlManager::Release(void)
 
 	delete __pInstance;
 	__pInstance = null;
+
+	elm_shutdown();
 }
 
 _ControlManager*
@@ -1401,10 +1405,7 @@ _ControlManager::OnSettingChanged(Tizen::Base::String& key)
 		IEnumeratorT<_TouchGestureDetector*>* pEnumerator = __pGestureList->GetEnumeratorN();
 		SysTryReturnVoidResult(NID_UI, pEnumerator, E_SYSTEM, "[E_SYSTEM] System error occurred.")
 
-		elm_init(0, null);
 		int duration = static_cast<int>(elm_config_longpress_timeout_get());
-		elm_shutdown();
-
 		if (duration == 0)
 		{
 			duration = 500;
diff --git a/src/ui/FUi_TouchLongPressGestureDetector.cpp b/src/ui/FUi_TouchLongPressGestureDetector.cpp
index f27f9f9..9723146 100644
--- a/src/ui/FUi_TouchLongPressGestureDetector.cpp
+++ b/src/ui/FUi_TouchLongPressGestureDetector.cpp
@@ -67,10 +67,7 @@ _TouchLongPressGestureDetector::_TouchLongPressGestureDetector(void)
 	__pLongPressInfoList = new (std::nothrow) ArrayListT<_LongPressInfo*>;
 	SysTryReturnVoidResult(NID_UI, __pLongPressInfoList, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
 
-	elm_init(0, null);
 	int __duration = static_cast<int>(elm_config_longpress_timeout_get());
-	elm_shutdown();
-
 	if (__duration == 0)
 	{
 		__duration = 500;