Merge remote-tracking branch 'origin/master' into tizen

diff --git a/src/Tizen.Uix.InputMethod/Interop/Interop.InputMethod.cs b/src/Tizen.Uix.InputMethod/Interop/Interop.InputMethod.cs
index 1ec40cf..79eaee8 100755 (executable)
--- a/src/Tizen.Uix.InputMethod/Interop/Interop.InputMethod.cs
+++ b/src/Tizen.Uix.InputMethod/Interop/Interop.InputMethod.cs
@@ -197,6 +197,9 @@ internal static partial class Interop
         [DllImport(Libraries.InputMethod, EntryPoint = "ime_finalize")]
         internal static extern ErrorCode ImeFinalize();
 
+        [DllImport(Libraries.InputMethod, EntryPoint = "ime_set_dotnet_flag")]
+        internal static extern ErrorCode ImeSetDotnetFlag(bool set);
+
         [DllImport(Libraries.InputMethod, EntryPoint = "ime_set_size")]
         internal static extern ErrorCode ImeSetSize(int portraitWidth, int portraitHeight, int landscapeWidth, int landscapeHeight);
 

diff --git a/src/Tizen.Uix.InputMethod/Tizen.Uix.InputMethod/InputMethodEditor.cs b/src/Tizen.Uix.InputMethod/Tizen.Uix.InputMethod/InputMethodEditor.cs
index 0e23e98..e59afb3 100755 (executable)
--- a/src/Tizen.Uix.InputMethod/Tizen.Uix.InputMethod/InputMethodEditor.cs
+++ b/src/Tizen.Uix.InputMethod/Tizen.Uix.InputMethod/InputMethodEditor.cs
@@ -1704,6 +1704,7 @@ namespace Tizen.Uix.InputMethod
             _imeCallbackStructGCHandle._imeCallbackStruct.hide = _hide;
             _imeCallbackStructGCHandle._imeCallbackStruct.show = _show;
 
+            ImeSetDotnetFlag(true);
             ErrorCode error = ImeRun(ref _imeCallbackStructGCHandle._imeCallbackStruct, IntPtr.Zero);
             if (error != ErrorCode.None)
             {