[dali_1.4.39] Merge branch 'devel/master'

Change-Id: If73fdf96d220dc5d1ce9d9267b65d43a2d5847b5

diff --git a/dali-csharp-binder/src/dali_wrap.cpp b/dali-csharp-binder/src/dali_wrap.cpp
index 5289e2f..3a3d457 100755 (executable)
--- a/dali-csharp-binder/src/dali_wrap.cpp
+++ b/dali-csharp-binder/src/dali_wrap.cpp
@@ -63105,7 +63105,8 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ViewImpl_GetBackgroundColor(void * jar
       Property::Map* resultMap = ((arg1)->GetProperty( Control::Property::BACKGROUND )).GetMap();
       if (resultMap)
       {
-        if(resultMap->Find( Toolkit::Visual::Property::TYPE )->Get<int>() == Visual::COLOR )
+        Dali::Property::Value* type = resultMap->Find( Toolkit::Visual::Property::TYPE );
+        if(type && type->Get<int>() == Visual::COLOR )
         {
           Dali::Property::Value* value = resultMap->Find( ColorVisual::Property::MIX_COLOR );
           if (value)

diff --git a/dali-csharp-binder/src/input-method-context.cpp b/dali-csharp-binder/src/input-method-context.cpp
index 822687a..e0c3a80 100755 (executable)
--- a/dali-csharp-binder/src/input-method-context.cpp
+++ b/dali-csharp-binder/src/input-method-context.cpp
@@ -1254,6 +1254,28 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_InputMethodContext_SetMIMEType(void * ja
 
 }
 
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_InputMethodContext_SetInputPanelPosition(void * jarg1, unsigned int jarg2, unsigned int jarg3) {
+  Dali::InputMethodContext *arg1 = (Dali::InputMethodContext *) 0 ;
+  unsigned int arg2 ;
+  unsigned int arg3 ;
+
+  arg1 = (Dali::InputMethodContext *)jarg1;
+  arg2 = (unsigned int)jarg2;
+  arg3 = (unsigned int)jarg3;
+  {
+    try {
+      (arg1)->SetInputPanelPosition(arg2, arg3);
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return ;
+      };
+    } catch (Dali::DaliException e) { SWIG_CSharpException(SWIG_UnknownError, e.condition); return ; } catch (...) { SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; }  }
+}
+
 
 // Signals
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_InputMethodContext_ActivatedSignal(void * jarg1) {

diff --git a/packaging/dali-csharp-binder.spec b/packaging/dali-csharp-binder.spec
index 24bde6a..c794f6a 100755 (executable)
--- a/packaging/dali-csharp-binder.spec
+++ b/packaging/dali-csharp-binder.spec
@@ -21,7 +21,7 @@
 
 Name: dali-csharp-binder
 Summary: The DALI Csharp Binder
-Version: 1.4.38
+Version: 1.4.39
 Release: 1
 Group: uifw/graphic
 License: Apache-2.0 and BSD-3-Clause and MIT