[dali_2.1.20] Merge branch 'devel/master'

Change-Id: Id8230967094db6eb13874397c58012737372f88f

diff --git a/dali-csharp-binder/src/drag-and-drop-wrap.cpp b/dali-csharp-binder/src/drag-and-drop-wrap.cpp
index 2f8bef6..ab6c7a8 100644 (file)
--- a/dali-csharp-binder/src/drag-and-drop-wrap.cpp
+++ b/dali-csharp-binder/src/drag-and-drop-wrap.cpp
@@ -35,6 +35,9 @@ static const char * nullExceptMsg = "Attempt to dereference null Dali::Adaptor::
 using DnDCallback = void(SWIGSTDCALL *)(const Dali::DragAndDrop::DragEvent&);
 DnDCallback dndCallback;
 
+using SourceCallback = void(SWIGSTDCALL *)(enum Dali::DragAndDrop::SourceEventType);
+SourceCallback sourceCallback;
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -51,7 +54,7 @@ SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_DragAndDrop_New__SWIG_0() {
  return jresult;
 }
 
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_DragAndDrop_StartDragAndDrop(void * argDnD, void * argSource, void * argShadow, void * argMimeType, char * argData) {
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_DragAndDrop_StartDragAndDrop(void * argDnD, void * argSource, void * argShadowWindow, void * argMimeType, char * argData, void * argSourceCallback) {
   Dali::DragAndDrop *dnd = (Dali::DragAndDrop *)argDnD;
 
   if (!dnd) {
@@ -60,9 +63,9 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_DragAndDrop_StartDragAndDrop(void * argD
   }
 
   Dali::Actor *pSource;
-  Dali::Actor *pShadow;
+  Dali::Window *pShadow;
   Dali::Actor source;
-  Dali::Actor shadow;
+  Dali::Window shadow;
 
   pSource = (Dali::Actor *)argSource;
   if (!pSource) {
@@ -70,7 +73,7 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_DragAndDrop_StartDragAndDrop(void * argD
     return false;
   }
 
-  pShadow = (Dali::Actor *)argShadow;
+  pShadow = (Dali::Window *)argShadowWindow;
   if (!pShadow) {
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, nullExceptMsg, 0);
     return false;
@@ -86,7 +89,8 @@ SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_DragAndDrop_StartDragAndDrop(void * argD
   bool result = false;
   {
     try {
-      result = dnd->StartDragAndDrop(source, shadow, dragData);
+      sourceCallback = (SourceCallback)argSourceCallback;
+      result = dnd->StartDragAndDrop(source, shadow, dragData, sourceCallback);
     }
     CALL_CATCH_EXCEPTION(0);
   }

diff --git a/dali-csharp-binder/src/text-editor-wrap.cpp b/dali-csharp-binder/src/text-editor-wrap.cpp
index ae51e97..a72fe7e 100755 (executable)
--- a/dali-csharp-binder/src/text-editor-wrap.cpp
+++ b/dali-csharp-binder/src/text-editor-wrap.cpp
@@ -393,6 +393,12 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_INPUT_LINE_SPACING_ge
 }
 
 
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_RELATIVE_LINE_SIZE_get() {
+
+  return (int)Dali::Toolkit::DevelTextEditor::Property::RELATIVE_LINE_SIZE;
+}
+
+
 SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_UNDERLINE_get() {
   int jresult ;
   int result;

diff --git a/dali-csharp-binder/src/text-label-wrap.cpp b/dali-csharp-binder/src/text-label-wrap.cpp
index 43b6db4..9a5d471 100755 (executable)
--- a/dali-csharp-binder/src/text-label-wrap.cpp
+++ b/dali-csharp-binder/src/text-label-wrap.cpp
@@ -67,6 +67,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextLabel_Property_ENABLE_FONT_SIZE_SCALE
   return (int)Dali::Toolkit::DevelTextLabel::Property::ENABLE_FONT_SIZE_SCALE;
 }
 
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextLabel_Property_RELATIVE_LINE_SIZE_get() {
+
+  return (int)Dali::Toolkit::DevelTextLabel::Property::RELATIVE_LINE_SIZE;
+}
+
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextLabel_GetTextSize(void * pTextLabel, unsigned int start, unsigned int end)
 {
   Dali::Toolkit::TextLabel *textLabel = (Dali::Toolkit::TextLabel *) 0;

diff --git a/packaging/dali-csharp-binder.spec b/packaging/dali-csharp-binder.spec
index daa3c14..7dc705d 100644 (file)
--- a/packaging/dali-csharp-binder.spec
+++ b/packaging/dali-csharp-binder.spec
@@ -21,7 +21,7 @@
 
 Name: dali2-csharp-binder
 Summary: The DALI Csharp Binder
-Version: 2.1.19
+Version: 2.1.20
 Release: 1
 Group: uifw/graphic
 License: Apache-2.0 and BSD-3-Clause and MIT