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

Change-Id: I9e67011cb48231c22a7087d511253caf1b5be948

diff --git a/dali-csharp-binder/src/application-wrap.cpp b/dali-csharp-binder/src/application-wrap.cpp
index 2f3e072..31e9936 100644 (file)
--- a/dali-csharp-binder/src/application-wrap.cpp
+++ b/dali-csharp-binder/src/application-wrap.cpp
@@ -1722,6 +1722,19 @@ SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Application_New_WithWindowSizePosition(
   return jresult;
 }
 
+SWIGEXPORT int32_t SWIGSTDCALL CSharp_Dali_Application_GetRenderThreadId(void* jarg1)
+{
+  Dali::Application* arg1 = (Dali::Application*)jarg1;
+
+  int32_t result;
+  try
+  {
+    result = Dali::DevelApplication::GetRenderThreadId(*arg1);
+  }
+  CALL_CATCH_EXCEPTION(0);
+  return result;
+}
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/dali-csharp-binder/src/web-view-wrap.cpp b/dali-csharp-binder/src/web-view-wrap.cpp
index dc049b0..6c2479e 100755 (executable)
--- a/dali-csharp-binder/src/web-view-wrap.cpp
+++ b/dali-csharp-binder/src/web-view-wrap.cpp
@@ -41,7 +41,7 @@
 #include "common.h"
 
 /* Callback for returning strings to C# without leaking memory */
-typedef char *(SWIGSTDCALL *SWIG_CSharpStringHelperCallback)(const char*);
+using SWIG_CSharpStringHelperCallback = char* (SWIGSTDCALL*)(const char*);
 extern SWIG_CSharpStringHelperCallback SWIG_csharp_string_callback;
 
 #ifdef __cplusplus
@@ -1020,6 +1020,23 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebView_RegisterNavigationPolicyDecidedC
   }
 }
 
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebView_RegisterNewWindowCreatedCallback(void * jarg1, void * jarg2) {
+  Dali::Toolkit::WebView *arg1 = (Dali::Toolkit::WebView *)jarg1;
+  void (*handler)(Dali::Toolkit::WebView*&) = (void (*)(Dali::Toolkit::WebView*&))jarg2;
+  {
+    try {
+      (arg1)->RegisterNewWindowCreatedCallback([handler](Dali::WebEnginePlugin*& plugin) {
+            Dali::Toolkit::WebView* outView = nullptr;
+            handler(outView);
+            if (outView != nullptr)
+            {
+              plugin = outView->GetPlugin();
+            }
+          });
+    } CALL_CATCH_EXCEPTION();
+  }
+}
+
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebView_RegisterCertificateConfirmedCallback(void * jarg1, void * jarg2) {
   Dali::Toolkit::WebView *arg1 = (Dali::Toolkit::WebView *)jarg1;
   void (*handler)(Dali::WebEngineCertificate*) = (void (*)(Dali::WebEngineCertificate*))jarg2;

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