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

Change-Id: I875f546ef4096e903a923eabcf74996d32bf1272

diff --git a/dali-csharp-binder/file.list b/dali-csharp-binder/file.list
index 8e45b1f..bafa573 100755 (executable)
--- a/dali-csharp-binder/file.list
+++ b/dali-csharp-binder/file.list
@@ -24,7 +24,8 @@ dali_csharp_binder_common_src_files = \
   ${dali_csharp_binder_dir}/src/input-method-options.cpp \
   ${dali_csharp_binder_dir}/src/animation.cpp \
   ${dali_csharp_binder_dir}/src/adaptor.cpp \
-  ${dali_csharp_binder_dir}/src/extents.cpp
+  ${dali_csharp_binder_dir}/src/extents.cpp \
+  ${dali_csharp_binder_dir}/src/text-label.cpp
 
 # added for key grab binding only for tizen
 # module: csharp-binder, backend: mobile,tv,ivi,watch

diff --git a/dali-csharp-binder/src/adaptor.cpp b/dali-csharp-binder/src/adaptor.cpp
index 88c75bd..8b88743 100755 (executable)
--- a/dali-csharp-binder/src/adaptor.cpp
+++ b/dali-csharp-binder/src/adaptor.cpp
@@ -609,37 +609,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Adaptor_SetRenderRefreshRate(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Adaptor_SetUseHardwareVSync(void * jarg1, unsigned int jarg2) {
-  Dali::Adaptor *arg1 = (Dali::Adaptor *) 0 ;
-  bool arg2 ;
-
-  arg1 = (Dali::Adaptor *)jarg1;
-  arg2 = jarg2 ? true : false;
-  {
-    try {
-      (arg1)->SetUseHardwareVSync(arg2);
-    } 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 ;
-      };
-    }
-  }
-
-}
-
-
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Adaptor_Get() {
   void * jresult ;
   Dali::Adaptor *result = 0 ;

diff --git a/dali-csharp-binder/src/text-label.cpp b/dali-csharp-binder/src/text-label.cpp
new file mode 100755 (executable)
index 0000000..e1ab8c4
--- /dev/null
+++ b/dali-csharp-binder/src/text-label.cpp
@@ -0,0 +1,27 @@
+
+#ifndef CSHARP_TEXT_LABEL
+#define CSHARP_TEXT_LABEL
+#endif
+
+#include "common.h"
+#include <dali-toolkit/public-api/controls/text-controls/text-label.h>
+#include <dali-toolkit/devel-api/controls/text-controls/text-label-devel.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+SWIGEXPORT int SWIGSTDCALL CSharp_TextLabel_Property_TEXT_FIT_get()
+{
+  int jresult;
+  int result;
+
+  result = (int)Dali::Toolkit::DevelTextLabel::Property::TEXT_FIT;
+  jresult = (int)result;
+  return jresult;
+}
+
+#ifdef __cplusplus
+}
+#endif
+

diff --git a/packaging/dali-csharp-binder.spec b/packaging/dali-csharp-binder.spec
index d57c53d..cba95b8 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.25
+Version: 1.4.26
 Release: 1
 Group: uifw/graphic
 License: Apache-2.0 and BSD-3-Clause and MIT