From 5332a432c94cf98550faad6eabd947bf5f710184 Mon Sep 17 00:00:00 2001 From: "joogab.yun" Date: Fri, 11 Feb 2022 11:16:54 +0900 Subject: [PATCH] [NUI] Add FeedTouch and FeedWheel --- src/Tizen.NUI/src/internal/Interop/Interop.Window.cs | 13 ++++++++----- src/Tizen.NUI/src/public/Window/Window.cs | 8 +++----- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.Window.cs b/src/Tizen.NUI/src/internal/Interop/Interop.Window.cs index 3b30f7e..c01d0e9 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.Window.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.Window.cs @@ -179,14 +179,17 @@ namespace Tizen.NUI [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, 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(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Window_FeedKeyEvent")] + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Window_FeedKey_Default_Window")] public static extern void FeedKeyEvent(global::System.Runtime.InteropServices.HandleRef jarg1); - [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Window_FeedTouchPoint")] - public static extern void FeedTouchPoint(global::System.Runtime.InteropServices.HandleRef touchPoint, int timeStamp); + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Window_FeedKey")] + public static extern void FeedKeyEvent(global::System.Runtime.InteropServices.HandleRef window, global::System.Runtime.InteropServices.HandleRef keyEvent); - [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Window_FeedWheelEvent")] - public static extern void FeedWheelEvent(global::System.Runtime.InteropServices.HandleRef wheelEvent); + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Window_FeedTouch")] + public static extern void FeedTouchPoint(global::System.Runtime.InteropServices.HandleRef window, global::System.Runtime.InteropServices.HandleRef touchPoint, int timeStamp); + + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Window_FeedWheel")] + public static extern void FeedWheelEvent(global::System.Runtime.InteropServices.HandleRef window, global::System.Runtime.InteropServices.HandleRef wheelEvent); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Adaptor_RenderOnce")] public static extern void RenderOnce(global::System.Runtime.InteropServices.HandleRef jarg1); diff --git a/src/Tizen.NUI/src/public/Window/Window.cs b/src/Tizen.NUI/src/public/Window/Window.cs index 398910a..c2d5618 100644 --- a/src/Tizen.NUI/src/public/Window/Window.cs +++ b/src/Tizen.NUI/src/public/Window/Window.cs @@ -1076,7 +1076,7 @@ namespace Tizen.NUI /// 5 public void FeedKey(Key keyEvent) { - Interop.Window.FeedKeyEvent(Key.getCPtr(keyEvent)); + Interop.Window.FeedKeyEvent(SwigCPtr, Key.getCPtr(keyEvent)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -1085,10 +1085,9 @@ namespace Tizen.NUI /// /// The touch point to feed. /// The timeStamp. - [EditorBrowsable(EditorBrowsableState.Never)] internal void FeedTouch(TouchPoint touchPoint, int timeStamp) { - Interop.Window.FeedTouchPoint(TouchPoint.getCPtr(touchPoint), timeStamp); + Interop.Window.FeedTouchPoint(SwigCPtr, TouchPoint.getCPtr(touchPoint), timeStamp); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -1096,10 +1095,9 @@ namespace Tizen.NUI /// Feeds a wheel event into the window. /// /// The wheel event to feed. - [EditorBrowsable(EditorBrowsableState.Never)] internal void FeedWheel(Wheel wheelEvent) { - Interop.Window.FeedWheelEvent(Wheel.getCPtr(wheelEvent)); + Interop.Window.FeedWheelEvent(SwigCPtr, Wheel.getCPtr(wheelEvent)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } -- 2.7.4