Fix for multi touch issue
authorHyun Lee <hyunn.lee@samsung.com>
Thu, 11 Apr 2013 12:05:15 +0000 (21:05 +0900)
committerHyun Lee <hyunn.lee@samsung.com>
Thu, 11 Apr 2013 12:25:06 +0000 (21:25 +0900)
Change-Id: I9023eaf973658f5641d65572cc64a0d97a082dc6
Signed-off-by: Hyun Lee <hyunn.lee@samsung.com>
src/controls/FWebCtrl_GestureState.cpp

index 19bfb84..46c189b 100755 (executable)
@@ -27,6 +27,7 @@
 #include <FGrpPoint.h>
 #include <FUi_CoordinateSystemUtils.h>
 #include <FUi_Control.h>
+#include <FUi_TouchManager.h>
 #include <FUi_UiTouchEvent.h>
 #include "FWebCtrl_GestureState.h"
 #include "FWebCtrl_Web.h"
@@ -388,8 +389,6 @@ _PinchGestureState::OnPinchGestureFinished(_TouchPinchGestureDetector& gesture)
        SetGestureEvent(gestureEvent, EWK_GESTURE_PINCH, Point(0, 0), Point(0, 0), 0.0, 0);
        pSmartData->api->gesture_end(const_cast<Ewk_View_Smart_Data*>(pSmartData), &gestureEvent);
 
-       __pWebCore->ChangeGesture(WEB_GESTURE_TYPE_TAP);
-
        return true;
 }
 
@@ -411,6 +410,14 @@ _PinchGestureState::OnTouchMoved(const _Control& source, const _TouchInfo& touch
 bool
 _PinchGestureState::OnTouchReleased(const _Control& source, const _TouchInfo& touchInfo)
 {
+       _TouchManager* pTouchManager = _TouchManager::GetInstance();
+       SysAssertf(pTouchManager, "Failed to get touch manager.");
+
+       if(pTouchManager->GetPointCount() == 0)
+       {
+               __pWebCore->ChangeGesture(WEB_GESTURE_TYPE_TAP);
+       }
+
        return true;
 }