Remove WebView touch event control

[Issue]        http://suprem.sec.samsung.net/jira/browse/TWF-1272
               http://suprem.sec.samsung.net/jira/browse/TWF-1270
[Problem]      Scrollbar dissapeared during web page scrolling,
               single scroll gesture scrolled only uri bar,
               web page needed another gesture
[Solution]     Removed disabling touch events for webview while
               hiding url bar.
[Verify]       Go to m.naver.com, try scrolling by single gesture

Change-Id: I0ba0a1b1b6cf18477fa45b36450a88bdb7adefbc
Signed-off-by: Maciej Skrzypkowski <m.skrzypkows@samsung.com>

diff --git a/core/AbstractWebEngine/AbstractWebEngine.h b/core/AbstractWebEngine/AbstractWebEngine.h
index 152c5c577719a67d37a5dc30228e3cc505b3c626..88aadd96776c801fe2de037268c4a265893c6ccd 100644 (file)
--- a/core/AbstractWebEngine/AbstractWebEngine.h
+++ b/core/AbstractWebEngine/AbstractWebEngine.h
@@ -357,12 +357,6 @@ public:
      * @param data User data.
      */
     virtual void findWord(const char *word, Eina_Bool forward, Evas_Smart_Cb found_cb, void *data) = 0;
-    /**
-     * @brief Enable or disable touch events for current web view
-     *
-     * @param enabled True if touch event have to be enabled, false else.
-     */
-    virtual void setTouchEvents(bool enabled) = 0;
 
     /**
      * @brief Get settings param.

diff --git a/services/SimpleUI/SimpleUI.cpp b/services/SimpleUI/SimpleUI.cpp
index 0da4dbd5b09817e4f18cd48615e8b464e6c8b9f6..16de56c2187a3c53e0785d8b949e17045aceee4c 100644 (file)
--- a/services/SimpleUI/SimpleUI.cpp
+++ b/services/SimpleUI/SimpleUI.cpp
@@ -315,7 +315,6 @@ void SimpleUI::connectUISignals()
     m_webPageUI->hideQuickAccess.connect(boost::bind(&QuickAccess::hideUI, m_quickAccess));
     m_webPageUI->bookmarkManagerClicked.connect(boost::bind(&SimpleUI::showBookmarkManagerUI, this));
 #if PROFILE_MOBILE
-    m_webPageUI->setWebViewTouchEvents.connect(boost::bind(&tizen_browser::basic_webengine::AbstractWebEngine<Evas_Object>::setTouchEvents, m_webEngine.get(), _1));
     m_webPageUI->hideMoreMenu.connect(boost::bind(&SimpleUI::closeMoreMenu, this));
     m_webPageUI->getURIEntry().mobileEntryFocused.connect(boost::bind(&WebPageUI::mobileEntryFocused, m_webPageUI));
     m_webPageUI->getURIEntry().mobileEntryUnfocused.connect(boost::bind(&WebPageUI::mobileEntryUnfocused, m_webPageUI));

diff --git a/services/WebEngineService/WebEngineService.cpp b/services/WebEngineService/WebEngineService.cpp
index 2f39f1dd5858ea9bc5a9641b94ed1a0bf807d6ad..00e0fd433d42ddb36d2cd841c839ec00f6be4c31 100644 (file)
--- a/services/WebEngineService/WebEngineService.cpp
+++ b/services/WebEngineService/WebEngineService.cpp
@@ -730,12 +730,6 @@ void WebEngineService::findWord(const char *word, Eina_Bool forward, Evas_Smart_
     m_currentWebView->findWord(word, forward, found_cb, data);
 }
 
-void WebEngineService::setTouchEvents(bool enabled)
-{
-    M_ASSERT(m_currentWebView);
-    m_currentWebView->setTouchEvents(enabled);
-}
-
 bool WebEngineService::getSettingsParam(WebEngineSettings param) {
     return m_settings.at(param);
 }

diff --git a/services/WebEngineService/WebEngineService.h b/services/WebEngineService/WebEngineService.h
index f43f53f985bd5baae02891f5f79a153a236e2478..35e78f904a2d792aa146988ed0ed20baf14a53ee 100644 (file)
--- a/services/WebEngineService/WebEngineService.h
+++ b/services/WebEngineService/WebEngineService.h
@@ -200,12 +200,6 @@ public:
      * @param data User data.
      */
     void findWord(const char *word, Eina_Bool forward, Evas_Smart_Cb found_cb, void *data);
-    /**
-     * @brief Enable or disable touch events for current web view
-     *
-     * @param enabled True if touch event have to be enabled, false else.
-     */
-    void setTouchEvents(bool enabled) override;
 
     /**
      * @brief Get settings param.

diff --git a/services/WebEngineService/WebView.cpp b/services/WebEngineService/WebView.cpp
index d81224b154ae544430df620df214e33f24e26c46..04ecf4c6967a3f991dd9d9844700c483dde92533 100755 (executable)
--- a/services/WebEngineService/WebView.cpp
+++ b/services/WebEngineService/WebView.cpp
@@ -1505,10 +1505,6 @@ void WebView::findWord(const char *word, Eina_Bool forward, Evas_Smart_Cb found_
     ewk_view_text_find(m_ewkView, word, find_option, FIND_WORD_MAX_COUNT);
 }
 
-void WebView::setTouchEvents(bool enabled) {
-    ewk_view_touch_events_enabled_set(m_ewkView, enabled);
-}
-
 void WebView::ewkSettingsAutoFittingSet(bool value)
 {
     Ewk_Settings* settings = ewk_view_settings_get(m_ewkView);

diff --git a/services/WebEngineService/WebView.h b/services/WebEngineService/WebView.h
index 9efaff40da214352379381ec2dfbd73a6764de8f..7b5959560fe0a1ed2d347926d85b4ddb4f037611 100644 (file)
--- a/services/WebEngineService/WebView.h
+++ b/services/WebEngineService/WebView.h
@@ -204,12 +204,6 @@ public:
      * @param data User data.
      */
     void findWord(const char *word, Eina_Bool forward, Evas_Smart_Cb found_cb, void *data);
-    /**
-     * @brief Enable or disable touch events
-     *
-     * @param enabled True if touch event have to be enabled, false else.
-     */
-    void setTouchEvents(bool enabled);
 
     /**
      * @brief Set auto fitting settings flag.

diff --git a/services/WebPageUI/WebPageUI.cpp b/services/WebPageUI/WebPageUI.cpp
index ec7cccb89d2329010088a818aea42cb1530ab05b..4051c3421f719bae45199c169191d32bc415002d 100644 (file)
--- a/services/WebPageUI/WebPageUI.cpp
+++ b/services/WebPageUI/WebPageUI.cpp
@@ -103,7 +103,6 @@ void WebPageUI::showUI()
     elm_gesture_layer_cb_add(m_gestureLayer, ELM_GESTURE_N_LINES, ELM_GESTURE_STATE_MOVE, _gesture_move, this);
     elm_gesture_layer_line_min_length_set(m_gestureLayer, SWIPE_MOMENTUM_TRESHOLD);
     elm_gesture_layer_line_distance_tolerance_set(m_gestureLayer, SWIPE_MOMENTUM_TRESHOLD);
-    elm_object_signal_callback_add(m_mainLayout,  "animation_finished", "ui", _gesture_finished, this);
 #endif
 }
 
@@ -131,7 +130,6 @@ void WebPageUI::hideUI()
     elm_object_event_callback_del(m_URIEntry->getContent(), _cb_down_pressed_on_urlbar, this);
 #if PROFILE_MOBILE && GESTURE
     elm_gesture_layer_cb_del(m_gestureLayer, ELM_GESTURE_N_LINES, ELM_GESTURE_STATE_MOVE, _gesture_move, this);
-    elm_object_signal_callback_del(m_mainLayout,  "animation_finished", "ui", _gesture_finished);
 #endif
 #if PROFILE_MOBILE
     hideMoreMenu();
@@ -669,9 +667,6 @@ void WebPageUI::gestureUp()
                 elm_object_signal_emit(m_mainLayout, "hide_uri_bar_vertical", "ui");
         } else
             BROWSER_LOGE("[%s:%d] Signal not found", __PRETTY_FUNCTION__, __LINE__);
-        if (m_statesMgr->equals(WPUState::MAIN_WEB_PAGE)) {
-            setWebViewTouchEvents(false);
-        }
     }
 }
 
@@ -679,22 +674,10 @@ void WebPageUI::gestureDown()
 {
     if (m_uriBarHidden) {
         BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-        if (m_statesMgr->equals(WPUState::MAIN_WEB_PAGE)) {
-            setWebViewTouchEvents(false);
-        }
         elm_object_signal_emit(m_mainLayout, "show_uri_bar", "ui");
         m_uriBarHidden = false;
     }
 }
-
-void WebPageUI::_gesture_finished(void* data, Evas_Object* /*obj*/, const char* /*emission*/, const char* /*source*/)
-{
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    auto self = reinterpret_cast<WebPageUI*>(data);
-    if (self->m_statesMgr->equals(WPUState::MAIN_WEB_PAGE)) {
-        self->setWebViewTouchEvents(true);
-    }
-}
 #endif
 
 #if PROFILE_MOBILE

diff --git a/services/WebPageUI/WebPageUI.h b/services/WebPageUI/WebPageUI.h
index 18821a60c78f5b66a76816a573d9c9eae30b5e1d..d8d9f657d689bbe31b20d1f2fe439455cce2dfdf 100644 (file)
--- a/services/WebPageUI/WebPageUI.h
+++ b/services/WebPageUI/WebPageUI.h
@@ -109,7 +109,6 @@ public:
     boost::signals2::signal<void ()> showQuickAccess;
     boost::signals2::signal<void ()> bookmarkManagerClicked;
     boost::signals2::signal<void ()> showZoomNavigation;
-    boost::signals2::signal<void (bool enabled)> setWebViewTouchEvents;
 
 private:
     static void faviconClicked(void* data, Evas_Object* obj, const char* emission, const char* source);
@@ -121,7 +120,6 @@ private:
 #endif
 #if PROFILE_MOBILE && GESTURE
     static Evas_Event_Flags _gesture_move(void *data, void *event_info);
-    static void _gesture_finished(void *data, Evas_Object *obj, const char *emission, const char *source);
 #endif
 
     void createLayout();

diff --git a/services/WebPageUI/edc/WebPageUI_mob.edc b/services/WebPageUI/edc/WebPageUI_mob.edc
index ab4a8eecdef6eec442fa806f1e8fc63a961a6e1a..771515953ed0ab4fad7112e2c5f24fc6f600caac 100644 (file)
--- a/services/WebPageUI/edc/WebPageUI_mob.edc
+++ b/services/WebPageUI/edc/WebPageUI_mob.edc
@@ -456,12 +456,6 @@ collections { base_scale: 2.6;
                 action: STATE_SET "visible" 0.0;
                 target: "progress_bar_light_bg";
             }
-            program {
-                name: "hide_uri_bar_finished";
-                signal: "hide_uri_bar_finished";
-                source: "ui";
-                action: SIGNAL_EMIT "animation_finished" "ui";
-            }
             program {
                 name: "hide_uri_bar_landscape";
                 signal: "hide_uri_bar_landscape";
@@ -470,7 +464,6 @@ collections { base_scale: 2.6;
                 action: STATE_SET "hidden_landscape" 0.0;
                 target: "uri_bar_bg";
                 transition: LINEAR 0.15;
-                after: "hide_uri_bar_finished";
             }
             program {
                 name: "hide_uri_bar_vertical";
@@ -480,13 +473,6 @@ collections { base_scale: 2.6;
                 action: STATE_SET "hidden_vertical" 0.0;
                 target: "uri_bar_bg";
                 transition: LINEAR 0.15;
-                after: "hide_uri_bar_finished";
-            }
-            program {
-                name: "show_uri_bar_finished";
-                signal: "show_uri_bar_finished";
-                source: "ui";
-                action: SIGNAL_EMIT "animation_finished" "ui";
             }
             program {
                 name: "show_uri_bar";
@@ -495,7 +481,6 @@ collections { base_scale: 2.6;
                 action: STATE_SET "default" 0.0;
                 target: "uri_bar_bg";
                 transition: LINEAR 0.15;
-                after: "show_uri_bar_finished";
             }
             program {
                 name: "hide_moremenu";