From 1ad32eab55adfc042a889edca171d594244ccc56 Mon Sep 17 00:00:00 2001 From: Seoyeon Kim Date: Thu, 23 Nov 2017 20:10:40 +0900 Subject: [PATCH] [NUI] Add Extents type Padding in View Change-Id: I28162d78511c490db77f0513c0bdd45a9ec74675 Signed-off-by: Seoyeon Kim --- src/Tizen.NUI/src/public/BaseComponents/View.cs | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) mode change 100755 => 100644 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 100755 new mode 100644 index a51e345..650b43f --- a/src/Tizen.NUI/src/public/BaseComponents/View.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/View.cs @@ -1092,7 +1092,6 @@ 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(); @@ -1100,7 +1099,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 PADDINGEX = NDalicPINVOKE.View_Property_PADDING_get(); + internal static readonly int PADDING = NDalicPINVOKE.View_Property_PADDING_get(); } /// @@ -4073,12 +4072,12 @@ namespace Tizen.NUI.BaseComponents /// /// Gets or sets the padding for use in layout. /// - /// 3 - public Vector4 Padding + /// 5 + public Extents Padding { get { - Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f); + Extents temp = new Extents(0, 0, 0, 0); GetProperty(View.Property.PADDING).Get(temp); return temp; } @@ -4514,20 +4513,24 @@ namespace Tizen.NUI.BaseComponents } /// - /// Gets or sets the Padding for use in layout. + /// [Obsolete("Please do not use! this will be deprecated")] /// + /// 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.PADDINGEX).Get(temp); + GetProperty(View.Property.PADDING).Get(temp); return temp; } set { - SetProperty(View.Property.PADDINGEX, new Tizen.NUI.PropertyValue(value)); + SetProperty(View.Property.PADDING, new Tizen.NUI.PropertyValue(value)); } } } -- 2.7.4