From fa4e6072d9ff33824a1559ac8d7a05fd1c6df3d2 Mon Sep 17 00:00:00 2001 From: "dongsug.song" Date: Tue, 26 Sep 2023 21:22:32 +0900 Subject: [PATCH] fix IME window crash issue Change-Id: Iff3a2bb33d89160941b84500711a49cacdea5d64 --- .../dali-adaptor/application-wrap.cpp | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/dali-csharp-binder/dali-adaptor/application-wrap.cpp b/dali-csharp-binder/dali-adaptor/application-wrap.cpp index fb4435ae..217eb02b 100644 --- a/dali-csharp-binder/dali-adaptor/application-wrap.cpp +++ b/dali-csharp-binder/dali-adaptor/application-wrap.cpp @@ -1610,37 +1610,41 @@ SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Application_New__SWIG_4(int jarg1, char return jresult; } -SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Application_New__SWIG_5(int jarg1, char* jarg3, int jarg4, void* jarg5, int jarg6) +SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Application_New__SWIG_5(int nuiArgc, char* nuiArgv, char* nuiStyleSheet, int nuiWindowMode, void* initRectangle, int nuiWindowType) { void* jresult; int* argc = nullptr; char*** argv = nullptr; - Dali::Application::WINDOW_MODE arg4; - Dali::PositionSize arg5; - Dali::PositionSize* argp5; - Dali::WindowType arg6; + Dali::Application::WINDOW_MODE windowMode; + Dali::PositionSize rect; + Dali::PositionSize* rectp; + Dali::WindowType windowType; Dali::Application result; - if(!jarg3) + GenerationArgV(nuiArgc, nuiArgv); + argc = &gArgC; + argv = &gArgV; + + if(!nuiStyleSheet) { SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0); return 0; } - std::string arg3(jarg3); - arg4 = (Dali::Application::WINDOW_MODE)jarg4; - argp5 = (Dali::PositionSize*)jarg5; - arg6 = (Dali::WindowType)jarg6; + std::string styleSheet(nuiStyleSheet); + windowMode = (Dali::Application::WINDOW_MODE)nuiWindowMode; + rectp = (Dali::PositionSize*)initRectangle; + windowType = (Dali::WindowType)nuiWindowType; - if(!argp5) + if(!rectp) { SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::PositionSize", 0); return 0; } - arg5 = *argp5; + rect = *rectp; { try { - result = Dali::DevelApplication::New(argc, argv, arg3, arg4, arg5, arg6); + result = Dali::DevelApplication::New(argc, argv, styleSheet, windowMode, rect, windowType); } CALL_CATCH_EXCEPTION(0); } -- 2.34.1