[Tizen] Add OverScrolled in WebView

Change-Id: I8c8506e56676ae802ff6983a1c5b2cd11d9429b0

diff --git a/dali/devel-api/adaptor-framework/web-engine/web-engine-plugin.h b/dali/devel-api/adaptor-framework/web-engine/web-engine-plugin.h
index 5c8094891034df69b7f95de1492dace429f41cf6..be5f07aeadcf45bf2b69bc6c0551ed31347a48b6 100755 (executable)
--- a/dali/devel-api/adaptor-framework/web-engine/web-engine-plugin.h
+++ b/dali/devel-api/adaptor-framework/web-engine/web-engine-plugin.h
@@ -67,12 +67,18 @@ public:
 
   // forward declaration.
   enum class ScrollEdge;
+  enum class OverScrolled;
 
   /**
    * @brief WebView callback related with scroll edge reached.
    */
   using WebEngineScrollEdgeReachedCallback = std::function<void(const ScrollEdge)>;
 
+  /**
+   * @brief WebView callback related with over scrolled.
+   */
+  using WebEngineOverScrolledCallback = std::function<void(const OverScrolled)>;
+
   /**
    * @brief WebView callback related with page url changed.
    */
@@ -221,6 +227,17 @@ public:
     BOTTOM, ///< Bottom edge reached.
   };
 
+  /**
+   * @brief Enumeration for the over scrolled.
+   */
+  enum class OverScrolled
+  {
+    LEFT,   ///< Left over scrolled.
+    RIGHT,  ///< Right over scrolled.
+    TOP,    ///< Top over scrolled.
+    BOTTOM, ///< Bottom over scrolled.
+  };
+
   /**
    * @brief Enumeration that provides the option to find text.
    */
@@ -838,6 +855,13 @@ public:
    */
   virtual void RegisterScrollEdgeReachedCallback(WebEngineScrollEdgeReachedCallback callback) = 0;
 
+  /**
+   * @brief Callback to be called when over scrolled.
+   *
+   * @param[in] callback
+   */
+  virtual void RegisterOverScrolledCallback(WebEngineOverScrolledCallback callback) = 0;
+
   /**
    * @brief Callback to be called when url is changed.
    *

diff --git a/dali/devel-api/adaptor-framework/web-engine/web-engine.cpp b/dali/devel-api/adaptor-framework/web-engine/web-engine.cpp
index 6a7e5c350a2b34943157403acc73025f2bc50709..999b1ae48f7ee7e788a36143135f58e0031eff37 100755 (executable)
--- a/dali/devel-api/adaptor-framework/web-engine/web-engine.cpp
+++ b/dali/devel-api/adaptor-framework/web-engine/web-engine.cpp
@@ -520,6 +520,11 @@ void WebEngine::RegisterScrollEdgeReachedCallback(Dali::WebEnginePlugin::WebEngi
   GetImplementation(*this).RegisterScrollEdgeReachedCallback(callback);
 }
 
+void WebEngine::RegisterOverScrolledCallback(Dali::WebEnginePlugin::WebEngineOverScrolledCallback callback)
+{
+  GetImplementation(*this).RegisterOverScrolledCallback(callback);
+}
+
 void WebEngine::RegisterUrlChangedCallback(Dali::WebEnginePlugin::WebEngineUrlChangedCallback callback)
 {
   GetImplementation(*this).RegisterUrlChangedCallback(callback);

diff --git a/dali/devel-api/adaptor-framework/web-engine/web-engine.h b/dali/devel-api/adaptor-framework/web-engine/web-engine.h
index aa96f3c21c195f1c66a8df58841a7ccaeedbe0df..34eed50941c1c18014417dc20feb96fcfbfaffc6 100755 (executable)
--- a/dali/devel-api/adaptor-framework/web-engine/web-engine.h
+++ b/dali/devel-api/adaptor-framework/web-engine/web-engine.h
@@ -713,6 +713,13 @@ public:
    */
   void RegisterScrollEdgeReachedCallback(Dali::WebEnginePlugin::WebEngineScrollEdgeReachedCallback callback);
 
+  /**
+   * @brief Callback to be called when over scrolled.
+   *
+   * @param[in] callback
+   */
+  void RegisterOverScrolledCallback(Dali::WebEnginePlugin::WebEngineOverScrolledCallback callback);
+
   /**
    * @brief Callback to be called when url is changed.
    *

diff --git a/dali/internal/web-engine/common/web-engine-impl.cpp b/dali/internal/web-engine/common/web-engine-impl.cpp
index 033aa7642d1ccd008f976d17022e83b6202772b4..7f4c977b2158493a525fab88ac55bb0db393bd43 100644 (file)
--- a/dali/internal/web-engine/common/web-engine-impl.cpp
+++ b/dali/internal/web-engine/common/web-engine-impl.cpp
@@ -730,6 +730,11 @@ void WebEngine::RegisterScrollEdgeReachedCallback(Dali::WebEnginePlugin::WebEngi
   mPlugin->RegisterScrollEdgeReachedCallback(callback);
 }
 
+void WebEngine::RegisterOverScrolledCallback(Dali::WebEnginePlugin::WebEngineOverScrolledCallback callback)
+{
+  mPlugin->RegisterOverScrolledCallback(callback);
+}
+
 void WebEngine::RegisterUrlChangedCallback(Dali::WebEnginePlugin::WebEngineUrlChangedCallback callback)
 {
   mPlugin->RegisterUrlChangedCallback(callback);

diff --git a/dali/internal/web-engine/common/web-engine-impl.h b/dali/internal/web-engine/common/web-engine-impl.h
index d8afbceb1f5909b88cf83400ddde4003b0d1aebd..505b2012ecfaeb4f5583184d12fb7f7b6d92110b 100755 (executable)
--- a/dali/internal/web-engine/common/web-engine-impl.h
+++ b/dali/internal/web-engine/common/web-engine-impl.h
@@ -507,6 +507,11 @@ public:
    */
   void RegisterScrollEdgeReachedCallback(Dali::WebEnginePlugin::WebEngineScrollEdgeReachedCallback callback);
 
+  /**
+   * @copydoc Dali::WebEngine::RegisterOverScrolledCallback()
+   */
+  void RegisterOverScrolledCallback(Dali::WebEnginePlugin::WebEngineOverScrolledCallback callback);
+
   /**
    * @copydoc Dali::WebEngine::RegisterUrlChangedCallback()
    */