From: Seongjun Yim Date: Tue, 2 Apr 2013 10:58:09 +0000 (+0900) Subject: fix panning gesture bug when SetScrollEnabled(false) X-Git-Tag: 2.1b_release~46 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f98a585917c4191401e215760a7d0eeea8ef56c8;p=framework%2Fosp%2Fweb.git fix panning gesture bug when SetScrollEnabled(false) Change-Id: I8df279b258292342f448000e6d542d021f8aac50 Signed-off-by: Seongjun Yim --- diff --git a/src/controls/FWebCtrl_Web.cpp b/src/controls/FWebCtrl_Web.cpp index f745983..ca64638 100755 --- a/src/controls/FWebCtrl_Web.cpp +++ b/src/controls/FWebCtrl_Web.cpp @@ -435,11 +435,18 @@ _Web::OnTouchPressed(const _Control& source, const _TouchInfo& touchInfo) bool _Web::OnTouchMoved(const _Control& source, const _TouchInfo& touchInfo) { - if (__pEflWebkit.get() && _WebSettingImpl::GetInstance(__pWebSetting.get())->IsScrollEnabled()) + if (__pEflWebkit.get()) { - SendTouchEventForJavaScript(touchInfo); + if (_WebSettingImpl::GetInstance(__pWebSetting.get())->IsScrollEnabled()) + { + SendTouchEventForJavaScript(touchInfo); - return __pGestureHandler->OnTouchMoved(source, touchInfo); + return __pGestureHandler->OnTouchMoved(source, touchInfo); + } + else if (__gestureType == WEB_GESTURE_TYPE_TAP) + { + return __pGestureHandler->OnTouchMoved(source, touchInfo); + } } return true;