[NUI] Rename OnStage signal related internal methods (#1891)
authorRichard Huang <hrdisaac@users.noreply.github.com>
Tue, 11 Aug 2020 07:25:42 +0000 (08:25 +0100)
committerGitHub <noreply@github.com>
Tue, 11 Aug 2020 07:25:42 +0000 (16:25 +0900)
src/Tizen.NUI/src/internal/CustomActorImpl.cs
src/Tizen.NUI/src/internal/Interop/Interop.ActorSignal.cs
src/Tizen.NUI/src/internal/Interop/Interop.CustomActorImpl.cs
src/Tizen.NUI/src/internal/Interop/Interop.ViewImplSignal.cs
src/Tizen.NUI/src/internal/ViewImpl.cs
src/Tizen.NUI/src/internal/ViewWrapperImpl.cs
src/Tizen.NUI/src/public/BaseComponents/CustomView.cs
src/Tizen.NUI/src/public/BaseComponents/ViewEvent.cs

index e0551ffe5cfefc42a95300abc735f0e6baef0841..72bd726015ef05fda18c2cc9d3379f85097a5aae 100755 (executable)
@@ -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();
         }
 
index 9b05187e03dbe1c9de8e5d03e4202a34975e4200..5070afdb21572fbb6de4ac346d7d529f44ae5072 100755 (executable)
@@ -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);
index 25af872e817ad922812b09098e434446db0cb518..9bfa90700f980b9a0ca97d9f76d7bc4356e1e7bd 100755 (executable)
@@ -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);
index 374d44fd7216d16cc4e3d8670bbce5240f4165bb..dbbb41df372836370c48c1b492186e4318ef9f55 100755 (executable)
@@ -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);
index 71c7e53c1b2eb9162bb92fd8fdc201ee34201cfd..2d840c1a82ddfe897b7f484fd631e345dd7f256a 100755 (executable)
@@ -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)
index 2f01d6085f15f86786d40dba7751455c48172366..6562c7d184d82d302e1a71e04dec047c84994065 100755 (executable)
@@ -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
     {
         /// <since_tizen> 3 </since_tizen>
-        public delegate void OnStageConnectionDelegate(int depth);
+        public delegate void OnSceneConnectionDelegate(int depth);
         /// <since_tizen> 3 </since_tizen>
-        public delegate void OnStageDisconnectionDelegate();
+        public delegate void OnSceneDisconnectionDelegate();
         /// <since_tizen> 3 </since_tizen>
         public delegate void OnChildAddDelegate(View view);
         /// <since_tizen> 3 </since_tizen>
@@ -94,8 +94,8 @@ namespace Tizen.NUI
         /// <since_tizen> 3 </since_tizen>
         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)
index 9ab6da8e8b4ce7279c529e932422d1fbebe45b63..0d763b9bdb98dc588f4f74722be22c5756996906 100755 (executable)
@@ -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);
index b2d09f9820a5be9c69fdbe17c0d4e43781f395fb..321650dcc68f2b8acd1b35a9cf06401d3fda59c0 100755 (executable)
@@ -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;