Modify window position data type

Current WindowPosition has the unsigned int data type.
It means that current data type can not support the negative coordinate.
This patch is to support it.

Change-Id: I0d6609425a158753878f51fdde96c4611dd894c5

diff --git a/dali-csharp-binder/src/dali-wrap.cpp b/dali-csharp-binder/src/dali-wrap.cpp
index 6a3dd4b..5fb9611 100755 (executable)
--- a/dali-csharp-binder/src/dali-wrap.cpp
+++ b/dali-csharp-binder/src/dali-wrap.cpp
@@ -6471,6 +6471,97 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Uint16Pair(void * jarg1) {
 
 }
 
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Int32Pair__SWIG_0() {
+  void * jresult ;
+  Dali::Int32Pair *result = 0 ;
+
+  {
+    try {
+      result = (Dali::Int32Pair *)new Dali::Int32Pair();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  jresult = (void *)result;
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Int32Pair__SWIG_1(int32_t x, int32_t y) {
+  void * jresult ;
+  Dali::Int32Pair *result = 0 ;
+
+  {
+    try {
+      result = (Dali::Int32Pair *)new Dali::Int32Pair(x,y);
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  jresult = (void *)result;
+  return jresult;
+}
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Int32Pair_SetX(void * int32Pair, int32_t x) {
+  Dali::Int32Pair *pInt32Pair = (Dali::Int32Pair *) (int32Pair) ;
+
+  {
+    try {
+      (pInt32Pair)->SetX(x);
+    } CALL_CATCH_EXCEPTION();
+  }
+}
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Int32Pair_GetX(void * int32Pair) {
+  int result ;
+  Dali::Int32Pair *pInt32Pair = (Dali::Int32Pair *) (int32Pair);
+
+  {
+    try {
+      result = ((Dali::Int32Pair const *)pInt32Pair)->GetX();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  return result;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Int32Pair_SetY(void * int32Pair, int32_t y) {
+  Dali::Int32Pair *pInt32Pair = (Dali::Int32Pair *) (int32Pair) ;
+
+  {
+    try {
+      (pInt32Pair)->SetY(y);
+    } CALL_CATCH_EXCEPTION();
+  }
+
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Int32Pair_GetY(void * int32Pair) {
+  Dali::Int32Pair *pInt32Pair = (Dali::Int32Pair *) (int32Pair) ;
+  int result;
+
+  {
+    try {
+      result = ((Dali::Int32Pair const *)pInt32Pair)->GetY();
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  return result;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Int32Pair(void * int32Pair) {
+  Dali::Int32Pair *pInt32Pair = (Dali::Int32Pair *) (int32Pair) ;
+
+  {
+    try {
+      delete pInt32Pair;
+    } CALL_CATCH_EXCEPTION();
+  }
+
+}
+
+
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Degree__SWIG_0() {
   void * jresult ;

diff --git a/dali-csharp-binder/src/window-wrap.cpp b/dali-csharp-binder/src/window-wrap.cpp
index 292798d..bc81fab 100644 (file)
--- a/dali-csharp-binder/src/window-wrap.cpp
+++ b/dali-csharp-binder/src/window-wrap.cpp
@@ -1495,52 +1495,55 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_GetSize(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Window_SetPosition(void * jarg1, void * jarg2) {
-  Dali::Window arg1 ;
-  Dali::Window::WindowPosition arg2 ;
-  Dali::Window *argp1 ;
-  Dali::Window::WindowPosition *argp2 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Window_SetPosition(void * handle, void * position) {
+  Dali::Window *pWindow;
+  Dali::Window window;
+  Dali::Window::WindowPosition *pPosition;
+  Dali::Window::WindowPosition windowPosition;
 
-  argp1 = (Dali::Window *)jarg1;
-  if (!argp1) {
+  pWindow = (Dali::Window *)handle;
+  if (!pWindow) {
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Window", 0);
     return ;
   }
-  arg1 = *argp1;
-  argp2 = (Dali::Window::WindowPosition *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Window::WindowPosition", 0);
+  window = *pWindow;
+
+  pPosition = (Dali::Window::WindowPosition *)position;
+  if (!pPosition) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::WindowPosition", 0);
     return ;
   }
-  arg2 = *argp2;
+  windowPosition = *pPosition;
+
   {
     try {
-      arg1.SetPosition(arg2);
+      window.SetPosition(windowPosition);
     } CALL_CATCH_EXCEPTION();
   }
 
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_GetPosition(void * jarg1) {
-  void * jresult ;
-  Dali::Window arg1 ;
-  Dali::Window *argp1 ;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_GetPosition(void * handle) {
+  Dali::Window *pWindow ;
+  Dali::Window window ;
+  Dali::Window::WindowPosition windowPosition;
   Dali::Window::WindowPosition result;
+  void * jresult ;
 
-  argp1 = (Dali::Window *)jarg1;
-  if (!argp1) {
+  pWindow = (Dali::Window *)handle;
+  if (!pWindow) {
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Window", 0);
     return 0;
   }
-  arg1 = *argp1;
+  window = *pWindow;
   {
     try {
-      result = arg1.GetPosition();
+      windowPosition = window.GetPosition();
     } CALL_CATCH_EXCEPTION(0);
   }
 
-  jresult = new Dali::Window::WindowPosition((const Dali::Window::WindowPosition &)result);
+  jresult = new Dali::Window::WindowPosition((const Dali::Window::WindowPosition &)windowPosition);
   return jresult;
 }
 
@@ -2773,7 +2776,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Moved_Signal_Emit(void * signal, void* w
   Dali::Signal< void (Dali::Window, Dali::Window::WindowPosition) > *movedSignal = (Dali::Signal< void (Dali::Window, Dali::Window::WindowPosition) > *) 0 ;
   Dali::Window* win = (Dali::Window*)winHandle;
   Dali::Window window;
-  Dali::Window::WindowPosition windowPosiztion;
+  Dali::Window::WindowPosition windowPosition;
   Dali::Window::WindowPosition *pPosition;
 
   movedSignal = (Dali::Signal< void (Dali::Window, Dali::Window::WindowPosition) > *)signal;
@@ -2784,14 +2787,14 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Moved_Signal_Emit(void * signal, void* w
 
   pPosition = (Dali::Window::WindowPosition *)position;
   if (!pPosition) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Window::WindowPosition", 0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Vector2", 0);
     return ;
   }
   window = *win;
-  windowPosiztion = *pPosition;
+  windowPosition = *pPosition;
   {
     try {
-      Dali_Signal_Window_Moved_Signal_Emit(movedSignal, window, windowPosiztion);
+      Dali_Signal_Window_Moved_Signal_Emit(movedSignal, window, windowPosition);
     } CALL_CATCH_EXCEPTION();
   }