From 8c96899d3e483f7e93281ff9bea8b0d9af0bdcca Mon Sep 17 00:00:00 2001 From: "EverLEEst(SangHyeon Lee)" Date: Mon, 21 Feb 2022 21:00:05 +0900 Subject: [PATCH] [NUI] renamed Interop enabled properties as DALi property name changes. --- src/Tizen.NUI/src/internal/Interop/Interop.ActorInternal.cs | 8 ++++---- src/Tizen.NUI/src/internal/Interop/Interop.ActorProperty.cs | 4 ++-- src/Tizen.NUI/src/public/BaseComponents/ViewBindableProperty.cs | 6 +++--- src/Tizen.NUI/src/public/BaseComponents/ViewEnum.cs | 2 +- src/Tizen.NUI/src/public/BaseComponents/ViewInternal.cs | 1 - 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.ActorInternal.cs b/src/Tizen.NUI/src/internal/Interop/Interop.ActorInternal.cs index fb7ede3..b28de7b 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.ActorInternal.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.ActorInternal.cs @@ -218,12 +218,12 @@ namespace Tizen.NUI [return: global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.U1)] public static extern bool IsFocusableInTouch(global::System.Runtime.InteropServices.HandleRef jarg1); - [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Actor_SetEnabled")] - public static extern void SetEanbled(global::System.Runtime.InteropServices.HandleRef jarg1, bool jarg2); + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Actor_SetUserInteractionEnabled")] + public static extern void SetUserInteractionEnabled(global::System.Runtime.InteropServices.HandleRef jarg1, bool jarg2); - [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Actor_IsEnabled")] + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Actor_IsUserInteractionEnabled")] [return: global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.U1)] - public static extern bool IsEnabled(global::System.Runtime.InteropServices.HandleRef jarg1); + public static extern bool IsUserInteractionEnabled(global::System.Runtime.InteropServices.HandleRef jarg1); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Actor_SetSizeScalePolicy")] public static extern void SetSizeScalePolicy(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2); diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.ActorProperty.cs b/src/Tizen.NUI/src/internal/Interop/Interop.ActorProperty.cs index 9d0c655..787ea14 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.ActorProperty.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.ActorProperty.cs @@ -150,8 +150,8 @@ namespace Tizen.NUI [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Actor_Property_SENSITIVE_get")] public static extern int SensitiveGet(); - [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Actor_Property_ENABLED_get")] - public static extern int EnabledGet(); + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Actor_Property_USER_INTERACTION_ENABLED_get")] + public static extern int UserInteractionEnabledGet(); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Actor_Property_LEAVE_REQUIRED_get")] public static extern int LeaveRequiredGet(); diff --git a/src/Tizen.NUI/src/public/BaseComponents/ViewBindableProperty.cs b/src/Tizen.NUI/src/public/BaseComponents/ViewBindableProperty.cs index c7cf3a2..ecb037b 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/ViewBindableProperty.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/ViewBindableProperty.cs @@ -1174,15 +1174,15 @@ namespace Tizen.NUI.BaseComponents var view = (View)bindable; if (newValue != null) { - Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.Enabled, new Tizen.NUI.PropertyValue((bool)newValue)); + Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.UserInteractionEnabled, new Tizen.NUI.PropertyValue((bool)newValue)); view.OnEnabled((bool)newValue); } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var view = (View)bindable; - bool temp = true; - Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.Enabled).Get(out temp); + bool temp = false; + Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.UserInteractionEnabled).Get(out temp); return temp; })); diff --git a/src/Tizen.NUI/src/public/BaseComponents/ViewEnum.cs b/src/Tizen.NUI/src/public/BaseComponents/ViewEnum.cs index d532c57..5e17067 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/ViewEnum.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/ViewEnum.cs @@ -216,7 +216,7 @@ namespace Tizen.NUI.BaseComponents internal static readonly int WorldMatrix = Interop.ActorProperty.WorldMatrixGet(); internal static readonly int NAME = Interop.ActorProperty.NameGet(); internal static readonly int SENSITIVE = Interop.ActorProperty.SensitiveGet(); - internal static readonly int Enabled = Interop.ActorProperty.EnabledGet(); + internal static readonly int UserInteractionEnabled = Interop.ActorProperty.UserInteractionEnabledGet(); internal static readonly int LeaveRequired = Interop.ActorProperty.LeaveRequiredGet(); internal static readonly int InheritOrientation = Interop.ActorProperty.InheritOrientationGet(); internal static readonly int InheritScale = Interop.ActorProperty.InheritScaleGet(); diff --git a/src/Tizen.NUI/src/public/BaseComponents/ViewInternal.cs b/src/Tizen.NUI/src/public/BaseComponents/ViewInternal.cs index 1accd75..2f4d277 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/ViewInternal.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/ViewInternal.cs @@ -1291,7 +1291,6 @@ namespace Tizen.NUI.BaseComponents } - private void DisConnectFromSignals() { if (HasBody() == false) -- 2.7.4