Add OverScrolled in WebView

Change-Id: Ie4b3b4d33c42d19507a620f48876279e3a534157

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 a4691e370216269078988a2bc86e9d0211c68290..c4f03a7b844cbabeb146fd94d989467d074f5383 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
@@ -69,12 +69,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.
    */
@@ -244,6 +250,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.
    */
@@ -884,6 +901,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 3e315049cac9e4512f752ca36856efce63028772..e8a79e041793205183b523d291a6ec3168b68eb0 100755 (executable)
--- a/dali/devel-api/adaptor-framework/web-engine/web-engine.cpp
+++ b/dali/devel-api/adaptor-framework/web-engine/web-engine.cpp
@@ -542,6 +542,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 788e56cbf393937f3191b38dec8fb52413886448..127cec284144ce754c06c2bcc0a98b0344a436f1 100644 (file)
--- a/dali/devel-api/adaptor-framework/web-engine/web-engine.h
+++ b/dali/devel-api/adaptor-framework/web-engine/web-engine.h
@@ -742,6 +742,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 fe7aa635c123a2583a2dd871b4552af57a465b77..1fc5cd30aa89a0b01242e3367065abe1908a5863 100644 (file)
--- a/dali/internal/web-engine/common/web-engine-impl.cpp
+++ b/dali/internal/web-engine/common/web-engine-impl.cpp
@@ -766,6 +766,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 ffd0f58a286bfc83cb450094347fef540862efc0..747abfcca41ec757c9b6cd0d793ac0a9932824cb 100755 (executable)
--- a/dali/internal/web-engine/common/web-engine-impl.h
+++ b/dali/internal/web-engine/common/web-engine-impl.h
@@ -522,6 +522,11 @@ public:
    */
   void RegisterScrollEdgeReachedCallback(Dali::WebEnginePlugin::WebEngineScrollEdgeReachedCallback callback);
 
+  /**
+   * @copydoc Dali::WebEngine::RegisterOverScrolledCallback()
+   */
+  void RegisterOverScrolledCallback(Dali::WebEnginePlugin::WebEngineOverScrolledCallback callback);
+
   /**
    * @copydoc Dali::WebEngine::RegisterUrlChangedCallback()
    */