Revert "[NUI] Add Extents type Padding in View" 47/161847/1 4.0.1-preview1-00029
authorhuiyu,eun <huiyu.eun@samsung.com>
Tue, 28 Nov 2017 01:36:49 +0000 (10:36 +0900)
committerhuiyu,eun <huiyu.eun@samsung.com>
Tue, 28 Nov 2017 01:36:58 +0000 (10:36 +0900)
This reverts commit 8e778f944377dcea5b7d2901c713f251271fbeb2.

Change-Id: I4bd54feecabb9c34dc5f0699ae61c2161364f99e

src/Tizen.NUI/src/public/BaseComponents/View.cs [changed mode: 0644->0755]

old mode 100644 (file)
new mode 100755 (executable)
index 1f1b131..73218bc
@@ -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();
         }
 
         /// <summary>
@@ -4081,12 +4082,12 @@ namespace Tizen.NUI.BaseComponents
         /// <summary>
         /// Gets or sets the padding for use in layout.
         /// </summary>
-        /// <since_tizen> 5 </since_tizen>
-        public Extents Padding
+        /// <since_tizen> 3 </since_tizen>
+        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
         }
 
         /// <summary>
-        /// [Obsolete("Please do not use! this will be deprecated")]
+        /// Gets or sets the Padding for use in layout.
         /// </summary>
-        /// Please do not use! this will be deprecated!
-        /// Instead please use Padding.
         /// <since_tizen> 4 </since_tizen>
-        [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));
             }
         }
     }