From 44c8ec65b5d0ed6d5c421b41c52b3b6c8dda605e Mon Sep 17 00:00:00 2001 From: Richard Huang Date: Tue, 11 Aug 2020 08:25:42 +0100 Subject: [PATCH] [NUI] Rename OnStage signal related internal methods (#1891) --- src/Tizen.NUI/src/internal/CustomActorImpl.cs | 10 ++++----- .../src/internal/Interop/Interop.ActorSignal.cs | 8 +++---- .../internal/Interop/Interop.CustomActorImpl.cs | 8 +++---- .../src/internal/Interop/Interop.ViewImplSignal.cs | 16 ++++++------- src/Tizen.NUI/src/internal/ViewImpl.cs | 26 +++++++++++----------- src/Tizen.NUI/src/internal/ViewWrapperImpl.cs | 22 +++++++++--------- .../src/public/BaseComponents/CustomView.cs | 6 ++--- .../src/public/BaseComponents/ViewEvent.cs | 6 ++--- 8 files changed, 51 insertions(+), 51 deletions(-) diff --git a/src/Tizen.NUI/src/internal/CustomActorImpl.cs b/src/Tizen.NUI/src/internal/CustomActorImpl.cs index e0551ff..72bd726 100755 --- a/src/Tizen.NUI/src/internal/CustomActorImpl.cs +++ b/src/Tizen.NUI/src/internal/CustomActorImpl.cs @@ -1,5 +1,5 @@ /* - * Copyright(c) 2018 Samsung Electronics Co., Ltd. + * Copyright(c) 2020 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -42,15 +42,15 @@ namespace Tizen.NUI return ret; } - public virtual void OnStageConnection(int depth) + public virtual void OnSceneConnection(int depth) { - Interop.CustomActorImpl.CustomActorImpl_OnStageConnection(swigCPtr, depth); + Interop.CustomActorImpl.CustomActorImpl_OnSceneConnection(swigCPtr, depth); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public virtual void OnStageDisconnection() + public virtual void OnSceneDisconnection() { - Interop.CustomActorImpl.CustomActorImpl_OnStageDisconnection(swigCPtr); + Interop.CustomActorImpl.CustomActorImpl_OnSceneDisconnection(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.ActorSignal.cs b/src/Tizen.NUI/src/internal/Interop/Interop.ActorSignal.cs index 9b05187..5070afd 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.ActorSignal.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.ActorSignal.cs @@ -38,11 +38,11 @@ namespace Tizen.NUI [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Actor_WheelEventSignal")] public static extern global::System.IntPtr Actor_WheelEventSignal(global::System.Runtime.InteropServices.HandleRef jarg1); - [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Actor_OnStageSignal")] - public static extern global::System.IntPtr Actor_OnStageSignal(global::System.Runtime.InteropServices.HandleRef jarg1); + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Actor_OnSceneSignal")] + public static extern global::System.IntPtr Actor_OnSceneSignal(global::System.Runtime.InteropServices.HandleRef jarg1); - [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Actor_OffStageSignal")] - public static extern global::System.IntPtr Actor_OffStageSignal(global::System.Runtime.InteropServices.HandleRef jarg1); + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Actor_OffSceneSignal")] + public static extern global::System.IntPtr Actor_OffSceneSignal(global::System.Runtime.InteropServices.HandleRef jarg1); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Actor_OnRelayoutSignal")] public static extern global::System.IntPtr Actor_OnRelayoutSignal(global::System.Runtime.InteropServices.HandleRef jarg1); diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.CustomActorImpl.cs b/src/Tizen.NUI/src/internal/Interop/Interop.CustomActorImpl.cs index 25af872..9bfa907 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.CustomActorImpl.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.CustomActorImpl.cs @@ -11,11 +11,11 @@ namespace Tizen.NUI [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_CustomActorImpl_Self")] public static extern global::System.IntPtr CustomActorImpl_Self(global::System.Runtime.InteropServices.HandleRef jarg1); - [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_CustomActorImpl_OnStageConnection")] - public static extern void CustomActorImpl_OnStageConnection(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2); + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_CustomActorImpl_OnSceneConnection")] + public static extern void CustomActorImpl_OnSceneConnection(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2); - [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_CustomActorImpl_OnStageDisconnection")] - public static extern void CustomActorImpl_OnStageDisconnection(global::System.Runtime.InteropServices.HandleRef jarg1); + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_CustomActorImpl_OnSceneDisconnection")] + public static extern void CustomActorImpl_OnSceneDisconnection(global::System.Runtime.InteropServices.HandleRef jarg1); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_CustomActorImpl_OnChildAdd")] public static extern void CustomActorImpl_OnChildAdd(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.ViewImplSignal.cs b/src/Tizen.NUI/src/internal/Interop/Interop.ViewImplSignal.cs index 374d44f..dbbb41d 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.ViewImplSignal.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.ViewImplSignal.cs @@ -8,17 +8,17 @@ namespace Tizen.NUI { internal static partial class ViewImplSignal { - [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_ViewImpl_OnStageConnection")] - public static extern void ViewImpl_OnStageConnection(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2); + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_ViewImpl_OnSceneConnection")] + public static extern void ViewImpl_OnSceneConnection(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2); - [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_ViewImpl_OnStageConnectionSwigExplicitViewImpl")] - public static extern void ViewImpl_OnStageConnectionSwigExplicitViewImpl(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2); + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_ViewImpl_OnSceneConnectionSwigExplicitViewImpl")] + public static extern void ViewImpl_OnSceneConnectionSwigExplicitViewImpl(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2); - [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_ViewImpl_OnStageDisconnection")] - public static extern void ViewImpl_OnStageDisconnection(global::System.Runtime.InteropServices.HandleRef jarg1); + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_ViewImpl_OnSceneDisconnection")] + public static extern void ViewImpl_OnSceneDisconnection(global::System.Runtime.InteropServices.HandleRef jarg1); - [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_ViewImpl_OnStageDisconnectionSwigExplicitViewImpl")] - public static extern void ViewImpl_OnStageDisconnectionSwigExplicitViewImpl(global::System.Runtime.InteropServices.HandleRef jarg1); + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_ViewImpl_OnSceneDisconnectionSwigExplicitViewImpl")] + public static extern void ViewImpl_OnSceneDisconnectionSwigExplicitViewImpl(global::System.Runtime.InteropServices.HandleRef jarg1); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_ViewImpl_OnChildAdd")] public static extern void ViewImpl_OnChildAdd(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); diff --git a/src/Tizen.NUI/src/internal/ViewImpl.cs b/src/Tizen.NUI/src/internal/ViewImpl.cs index 71c7e53..2d840c1 100755 --- a/src/Tizen.NUI/src/internal/ViewImpl.cs +++ b/src/Tizen.NUI/src/internal/ViewImpl.cs @@ -1,5 +1,5 @@ /* - * Copyright(c) 2019 Samsung Electronics Co., Ltd. + * Copyright(c) 2020 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -229,15 +229,15 @@ namespace Tizen.NUI return ret; } - protected virtual new void OnStageConnection(int depth) + protected virtual new void OnSceneConnection(int depth) { - if (SwigDerivedClassHasMethod("OnStageConnection", swigMethodTypes0)) Interop.ViewImplSignal.ViewImpl_OnStageConnectionSwigExplicitViewImpl(swigCPtr, depth); else Interop.ViewImplSignal.ViewImpl_OnStageConnection(swigCPtr, depth); + if (SwigDerivedClassHasMethod("OnSceneConnection", swigMethodTypes0)) Interop.ViewImplSignal.ViewImpl_OnSceneConnectionSwigExplicitViewImpl(swigCPtr, depth); else Interop.ViewImplSignal.ViewImpl_OnSceneConnection(swigCPtr, depth); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - protected virtual new void OnStageDisconnection() + protected virtual new void OnSceneDisconnection() { - if (SwigDerivedClassHasMethod("OnStageDisconnection", swigMethodTypes1)) Interop.ViewImplSignal.ViewImpl_OnStageDisconnectionSwigExplicitViewImpl(swigCPtr); else Interop.ViewImplSignal.ViewImpl_OnStageDisconnection(swigCPtr); + if (SwigDerivedClassHasMethod("OnSceneDisconnection", swigMethodTypes1)) Interop.ViewImplSignal.ViewImpl_OnSceneDisconnectionSwigExplicitViewImpl(swigCPtr); else Interop.ViewImplSignal.ViewImpl_OnSceneDisconnection(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -482,10 +482,10 @@ namespace Tizen.NUI private void SwigDirectorConnect() { - if (SwigDerivedClassHasMethod("OnStageConnection", swigMethodTypes0)) - swigDelegate0 = new SwigDelegateViewImpl_0(SwigDirectorOnStageConnection); - if (SwigDerivedClassHasMethod("OnStageDisconnection", swigMethodTypes1)) - swigDelegate1 = new SwigDelegateViewImpl_1(SwigDirectorOnStageDisconnection); + if (SwigDerivedClassHasMethod("OnSceneConnection", swigMethodTypes0)) + swigDelegate0 = new SwigDelegateViewImpl_0(SwigDirectorOnSceneConnection); + if (SwigDerivedClassHasMethod("OnSceneDisconnection", swigMethodTypes1)) + swigDelegate1 = new SwigDelegateViewImpl_1(SwigDirectorOnSceneDisconnection); if (SwigDerivedClassHasMethod("OnChildAdd", swigMethodTypes2)) swigDelegate2 = new SwigDelegateViewImpl_2(SwigDirectorOnChildAdd); if (SwigDerivedClassHasMethod("OnChildRemove", swigMethodTypes3)) @@ -574,14 +574,14 @@ namespace Tizen.NUI return hasDerivedMethod && (methodInfo != null); } - private void SwigDirectorOnStageConnection(int depth) + private void SwigDirectorOnSceneConnection(int depth) { - OnStageConnection(depth); + OnSceneConnection(depth); } - private void SwigDirectorOnStageDisconnection() + private void SwigDirectorOnSceneDisconnection() { - OnStageDisconnection(); + OnSceneDisconnection(); } private void SwigDirectorOnChildAdd(global::System.IntPtr child) diff --git a/src/Tizen.NUI/src/internal/ViewWrapperImpl.cs b/src/Tizen.NUI/src/internal/ViewWrapperImpl.cs index 2f01d60..6562c7d 100755 --- a/src/Tizen.NUI/src/internal/ViewWrapperImpl.cs +++ b/src/Tizen.NUI/src/internal/ViewWrapperImpl.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,9 +22,9 @@ namespace Tizen.NUI internal sealed class ViewWrapperImpl : ViewImpl { /// 3 - public delegate void OnStageConnectionDelegate(int depth); + public delegate void OnSceneConnectionDelegate(int depth); /// 3 - public delegate void OnStageDisconnectionDelegate(); + public delegate void OnSceneDisconnectionDelegate(); /// 3 public delegate void OnChildAddDelegate(View view); /// 3 @@ -94,8 +94,8 @@ namespace Tizen.NUI /// 3 public delegate void OnLongPressDelegate(LongPressGesture longPress); - public new OnStageConnectionDelegate OnStageConnection; - public new OnStageDisconnectionDelegate OnStageDisconnection; + public new OnSceneConnectionDelegate OnSceneConnection; + public new OnSceneDisconnectionDelegate OnSceneDisconnection; public new OnChildAddDelegate OnChildAdd; public new OnChildRemoveDelegate OnChildRemove; public new OnPropertySetDelegate OnPropertySet; @@ -259,8 +259,8 @@ namespace Tizen.NUI private void DirectorConnect() { - Delegate0 = new DelegateViewWrapperImpl_0(DirectorOnStageConnection); - Delegate1 = new DelegateViewWrapperImpl_1(DirectorOnStageDisconnection); + Delegate0 = new DelegateViewWrapperImpl_0(DirectorOnSceneConnection); + Delegate1 = new DelegateViewWrapperImpl_1(DirectorOnSceneDisconnection); Delegate2 = new DelegateViewWrapperImpl_2(DirectorOnChildAdd); Delegate3 = new DelegateViewWrapperImpl_3(DirectorOnChildRemove); Delegate4 = new DelegateViewWrapperImpl_4(DirectorOnPropertySet); @@ -299,14 +299,14 @@ namespace Tizen.NUI Interop.ViewWrapperImpl.ViewWrapperImpl_director_connect(swigCPtr, Delegate0, Delegate1, Delegate2, Delegate3, Delegate4, Delegate5, Delegate6, Delegate7, Delegate8, Delegate9, Delegate10, Delegate11, Delegate12, Delegate13, Delegate14, Delegate15, Delegate16, Delegate17, Delegate18, Delegate19, Delegate20, Delegate21, Delegate24, Delegate25, Delegate26, Delegate27, Delegate28, Delegate29, Delegate30, Delegate31, Delegate32, Delegate33, Delegate34, Delegate35, Delegate36, Delegate37, Delegate38, null, null); } - private void DirectorOnStageConnection(int depth) + private void DirectorOnSceneConnection(int depth) { - OnStageConnection(depth); + OnSceneConnection(depth); } - private void DirectorOnStageDisconnection() + private void DirectorOnSceneDisconnection() { - OnStageDisconnection(); + OnSceneDisconnection(); } private void DirectorOnChildAdd(global::System.IntPtr child) diff --git a/src/Tizen.NUI/src/public/BaseComponents/CustomView.cs b/src/Tizen.NUI/src/public/BaseComponents/CustomView.cs index 9ab6da8..0d763b9 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/CustomView.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/CustomView.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -735,8 +735,8 @@ namespace Tizen.NUI.BaseComponents private void Initialize() { // Registering CustomView virtual functions to viewWrapperImpl delegates. - viewWrapperImpl.OnStageConnection = new ViewWrapperImpl.OnStageConnectionDelegate(OnStageConnection); - viewWrapperImpl.OnStageDisconnection = new ViewWrapperImpl.OnStageDisconnectionDelegate(OnStageDisconnection); + viewWrapperImpl.OnSceneConnection = new ViewWrapperImpl.OnSceneConnectionDelegate(OnStageConnection); + viewWrapperImpl.OnSceneDisconnection = new ViewWrapperImpl.OnSceneDisconnectionDelegate(OnStageDisconnection); viewWrapperImpl.OnChildAdd = new ViewWrapperImpl.OnChildAddDelegate(OnChildAdd); viewWrapperImpl.OnChildRemove = new ViewWrapperImpl.OnChildRemoveDelegate(OnChildRemove); viewWrapperImpl.OnPropertySet = new ViewWrapperImpl.OnPropertySetDelegate(OnPropertySet); diff --git a/src/Tizen.NUI/src/public/BaseComponents/ViewEvent.cs b/src/Tizen.NUI/src/public/BaseComponents/ViewEvent.cs index b2d09f9..321650d 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/ViewEvent.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/ViewEvent.cs @@ -1,5 +1,5 @@ /* - * Copyright(c) 2019 Samsung Electronics Co., Ltd. + * Copyright(c) 2020 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -542,7 +542,7 @@ namespace Tizen.NUI.BaseComponents internal ViewSignal OnWindowSignal() { - ViewSignal ret = new ViewSignal(Interop.ActorSignal.Actor_OnStageSignal(swigCPtr), false); + ViewSignal ret = new ViewSignal(Interop.ActorSignal.Actor_OnSceneSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -550,7 +550,7 @@ namespace Tizen.NUI.BaseComponents internal ViewSignal OffWindowSignal() { - ViewSignal ret = new ViewSignal(Interop.ActorSignal.Actor_OffStageSignal(swigCPtr), false); + ViewSignal ret = new ViewSignal(Interop.ActorSignal.Actor_OffSceneSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; -- 2.7.4