Revert "[Tizen] Revert "Binding IsGeometryHittestEnabled()""

This reverts commit 40de931b39489a33cff27d80adacfdc3f22c7b65.

diff --git a/dali-csharp-binder/common/dali-wrap.cpp b/dali-csharp-binder/common/dali-wrap.cpp
index d634322a3c5a990e528d073dbfe13fb8ee920f19..49328456d11507733461bba355f837b73ca68b23 100644 (file)
--- a/dali-csharp-binder/common/dali-wrap.cpp
+++ b/dali-csharp-binder/common/dali-wrap.cpp
@@ -12642,6 +12642,41 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GestureDetector_GetAttachedActor(void
 }
 
 
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_GestureDetector_HandleEvent(void * jdetector, void * jactor, void * jtouch) {
+  bool result = false;
+  Dali::GestureDetector *detector = (Dali::GestureDetector *)jdetector;
+  Dali::Actor *actor = (Dali::Actor *)jactor;
+  Dali::TouchEvent *touchEvent = (Dali::TouchEvent *)jtouch;
+
+  if (!detector) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::GestureDetector const & type is null", 0);
+    return false;
+  }
+  {
+    try {
+      result = ((Dali::GestureDetector *)detector)->HandleEvent(*actor, *touchEvent);
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  return result;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_GestureDetector_CancelAllOtherGestureDetectors(void * jdetector) {
+  Dali::GestureDetector *detector = (Dali::GestureDetector *)jdetector;
+
+  if (!detector) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::GestureDetector const & type is null", 0);
+    return;
+  }
+  {
+    try {
+      ((Dali::GestureDetector *)detector)->CancelAllOtherGestureDetectors();
+    } CALL_CATCH_EXCEPTION();
+  }
+}
+
+
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Gesture(void * jarg1) {
   void * jresult ;
   Dali::Gesture *arg1 = 0 ;
@@ -14677,21 +14712,6 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CustomActorImpl_GetNaturalSize(void *
   return jresult;
 }
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_GestureDetector_FeedTouch(void * jdetector, void * jactor, void * jtouch) {
-  bool result = false;
-  Dali::GestureDetector *detector = (Dali::GestureDetector *)jdetector;
-  Dali::Actor *actor = (Dali::Actor *)jactor;
-  Dali::TouchEvent *touchEvent = (Dali::TouchEvent *)jtouch;
-
-  {
-    try {
-      result = ((Dali::GestureDetector *)detector)->FeedTouch(*actor, *touchEvent);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  return result;
-}
-
 
 SWIGEXPORT float SWIGSTDCALL CSharp_Dali_CustomActorImpl_CalculateChildSize(void * jarg1, void * jarg2, int jarg3) {
   float jresult ;

diff --git a/dali-csharp-binder/dali-adaptor/dali-adaptor-wrap.cpp b/dali-csharp-binder/dali-adaptor/dali-adaptor-wrap.cpp
index 6f435e7ebf0230f7230fa4b3ac6470be195ee489..6514f874da274748111d8414583594a85c9103d4 100644 (file)
--- a/dali-csharp-binder/dali-adaptor/dali-adaptor-wrap.cpp
+++ b/dali-csharp-binder/dali-adaptor/dali-adaptor-wrap.cpp
@@ -87,6 +87,14 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_SetGeometryHittestEnabled(bool enable) {
 
 }
 
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_IsGeometryHittestEnabled() {
+  bool ret = false;
+  try {
+    ret = Dali::DevelWindowSystem::IsGeometryHittestEnabled();
+  } CALL_CATCH_EXCEPTION(0);
+  return ret;
+}
+
 
 // Timer