From ed2578ca861a723ac519a5150f5cb626fae0500b Mon Sep 17 00:00:00 2001 From: "huiyu,eun" Date: Tue, 28 Nov 2017 10:36:49 +0900 Subject: [PATCH] Revert "[NUI] Add Extents type Padding in View" This reverts commit 8e778f944377dcea5b7d2901c713f251271fbeb2. Change-Id: I4bd54feecabb9c34dc5f0699ae61c2161364f99e --- src/Tizen.NUI/src/public/BaseComponents/View.cs | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) mode change 100644 => 100755 src/Tizen.NUI/src/public/BaseComponents/View.cs diff --git a/src/Tizen.NUI/src/public/BaseComponents/View.cs b/src/Tizen.NUI/src/public/BaseComponents/View.cs old mode 100644 new mode 100755 index 1f1b131..73218bc --- a/src/Tizen.NUI/src/public/BaseComponents/View.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/View.cs @@ -1092,6 +1092,7 @@ namespace Tizen.NUI.BaseComponents internal static readonly int SIZE_SCALE_POLICY = NDalicPINVOKE.Actor_Property_SIZE_SCALE_POLICY_get(); internal static readonly int WIDTH_FOR_HEIGHT = NDalicPINVOKE.Actor_Property_WIDTH_FOR_HEIGHT_get(); internal static readonly int HEIGHT_FOR_WIDTH = NDalicPINVOKE.Actor_Property_HEIGHT_FOR_WIDTH_get(); + internal static readonly int PADDING = NDalicPINVOKE.Actor_Property_PADDING_get(); internal static readonly int MINIMUM_SIZE = NDalicPINVOKE.Actor_Property_MINIMUM_SIZE_get(); internal static readonly int MAXIMUM_SIZE = NDalicPINVOKE.Actor_Property_MAXIMUM_SIZE_get(); internal static readonly int INHERIT_POSITION = NDalicPINVOKE.Actor_Property_INHERIT_POSITION_get(); @@ -1099,7 +1100,7 @@ namespace Tizen.NUI.BaseComponents internal static readonly int INHERIT_LAYOUT_DIRECTION = NDalicManualPINVOKE.Actor_Property_INHERIT_LAYOUT_DIRECTION_get(); internal static readonly int LAYOUT_DIRECTION = NDalicManualPINVOKE.Actor_Property_LAYOUT_DIRECTION_get(); internal static readonly int MARGIN = NDalicPINVOKE.View_Property_MARGIN_get(); - internal static readonly int PADDING = NDalicPINVOKE.View_Property_PADDING_get(); + internal static readonly int PADDINGEX = NDalicPINVOKE.View_Property_PADDING_get(); } /// @@ -4081,12 +4082,12 @@ namespace Tizen.NUI.BaseComponents /// /// Gets or sets the padding for use in layout. /// - /// 5 - public Extents Padding + /// 3 + public Vector4 Padding { get { - Extents temp = new Extents(0, 0, 0, 0); + Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f); GetProperty(View.Property.PADDING).Get(temp); return temp; } @@ -4533,24 +4534,20 @@ namespace Tizen.NUI.BaseComponents } /// - /// [Obsolete("Please do not use! this will be deprecated")] + /// Gets or sets the Padding for use in layout. /// - /// Please do not use! this will be deprecated! - /// Instead please use Padding. /// 4 - [Obsolete("Please do not use! this will be deprecated, instead please use Padding.")] - [EditorBrowsable(EditorBrowsableState.Never)] public Extents PaddingEX { get { Extents temp = new Extents(0, 0, 0, 0); - GetProperty(View.Property.PADDING).Get(temp); + GetProperty(View.Property.PADDINGEX).Get(temp); return temp; } set { - SetProperty(View.Property.PADDING, new Tizen.NUI.PropertyValue(value)); + SetProperty(View.Property.PADDINGEX, new Tizen.NUI.PropertyValue(value)); } } } -- 2.7.4