From 30605ef5396628a94cb69f3c5a4679b8910cd2e9 Mon Sep 17 00:00:00 2001 From: "xb.teng" Date: Wed, 8 Nov 2017 15:43:18 +0800 Subject: [PATCH] [NUI] Fix FeedKeyEvent issue 1. Change FeedKeyEvent api to non-static, 2. Fix FeedKeyEvent crash Change-Id: I6d6a4bb8468b0cae772c39849b56ba770e18f1a3 --- src/Tizen.NUI/src/internal/ManualPINVOKE.cs | 2 +- src/Tizen.NUI/src/public/Window.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 src/Tizen.NUI/src/public/Window.cs diff --git a/src/Tizen.NUI/src/internal/ManualPINVOKE.cs b/src/Tizen.NUI/src/internal/ManualPINVOKE.cs index 13a3bc2..1b75ff9 100755 --- a/src/Tizen.NUI/src/internal/ManualPINVOKE.cs +++ b/src/Tizen.NUI/src/internal/ManualPINVOKE.cs @@ -850,7 +850,7 @@ namespace Tizen.NUI [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Window_SetTransparency")] public static extern global::System.IntPtr SetTransparency(global::System.Runtime.InteropServices.HandleRef jarg1, bool jarg2); - [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Adaptor_FeedKeyEvent")] + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Window_FeedKeyEvent")] public static extern void Window_FeedKeyEvent(global::System.Runtime.InteropServices.HandleRef jarg1); [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_MakeCallback")] diff --git a/src/Tizen.NUI/src/public/Window.cs b/src/Tizen.NUI/src/public/Window.cs old mode 100644 new mode 100755 index 5cae4d9..3adf2a5 --- a/src/Tizen.NUI/src/public/Window.cs +++ b/src/Tizen.NUI/src/public/Window.cs @@ -1668,7 +1668,7 @@ namespace Tizen.NUI /// Feed a key-event into the window. /// /// 4 - public static void FeedKeyEvent(Key keyEvent) + public void FeedKeyEvent(Key keyEvent) { NDalicManualPINVOKE.Window_FeedKeyEvent(Key.getCPtr(keyEvent)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); -- 2.7.4