From ac0155cf23aaa3d7093a4b300acea09e0ddd8170 Mon Sep 17 00:00:00 2001 From: huiyueun <35286162+huiyueun@users.noreply.github.com> Date: Thu, 11 Jun 2020 11:38:19 +0900 Subject: [PATCH] Revert "[NUI] Add MIN_LINE_SIZE property at TextLabel (#1619)" (#1687) This reverts commit b949a3d1015a0ce1ad9831ca91c58b13437d4cef. --- .../src/internal/Interop/Interop.TextLabel.cs | 5 +-- .../src/public/BaseComponents/TextLabel.cs | 37 ---------------------- 2 files changed, 1 insertion(+), 41 deletions(-) diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.TextLabel.cs b/src/Tizen.NUI/src/internal/Interop/Interop.TextLabel.cs index eed22cc..2222426 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.TextLabel.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.TextLabel.cs @@ -97,7 +97,7 @@ namespace Tizen.NUI [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_TextLabel_Property_ELLIPSIS_get")] public static extern int TextLabel_Property_ELLIPSIS_get(); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_TextLabel_Property_LINE_COUNT_get")] public static extern int TextLabel_Property_LINE_COUNT_get(); @@ -124,9 +124,6 @@ namespace Tizen.NUI [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_TextLabel_Property_TEXT_FIT_get")] public static extern int TextLabel_Property_TEXT_FIT_get(); - - [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_TextLabel_Property_MIN_LINE_SIZE_get")] - public static extern int TextLabel_Property_MIN_LINE_SIZE_get(); } } } \ No newline at end of file diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs b/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs index 6442602..b4eed47 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs @@ -529,24 +529,6 @@ namespace Tizen.NUI.BaseComponents return temp; }); - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] - public static readonly BindableProperty MinLineSizeProperty = BindableProperty.Create(nameof(MinLineSize), typeof(float), typeof(TextLabel), default(float), propertyChanged: (bindable, oldValue, newValue) => - { - var textLabel = (TextLabel)bindable; - if (newValue != null) - { - Tizen.NUI.Object.SetProperty(textLabel.swigCPtr, TextLabel.Property.MIN_LINE_SIZE, new Tizen.NUI.PropertyValue((float)newValue)); - } - }, - defaultValueCreator: (bindable) => - { - var textLabel = (TextLabel)bindable; - float temp = 0.0f; - Tizen.NUI.Object.GetProperty(textLabel.swigCPtr, TextLabel.Property.MIN_LINE_SIZE).Get(out temp); - return temp; - }); - private string textLabelSid = null; private bool systemlangTextFlag = false; @@ -1368,24 +1350,6 @@ namespace Tizen.NUI.BaseComponents } /// - /// The MinLineSize property.
- ///
- /// 8 - [EditorBrowsable(EditorBrowsableState.Never)] - public float MinLineSize - { - get - { - return (float)GetValue(MinLineSizeProperty); - } - set - { - SetValue(MinLineSizeProperty, value); - NotifyPropertyChangedAndRequestLayout(); - } - } - - /// /// Downcasts a handle to textLabel handle /// /// @@ -1595,7 +1559,6 @@ namespace Tizen.NUI.BaseComponents internal static readonly int VERTICAL_LINE_ALIGNMENT = Interop.TextLabel.TextLabel_Property_VERTICAL_LINE_ALIGNMENT_get(); internal static readonly int MATCH_SYSTEM_LANGUAGE_DIRECTION = Interop.TextLabel.TextLabel_Property_MATCH_SYSTEM_LANGUAGE_DIRECTION_get(); internal static readonly int TEXT_FIT = Interop.TextLabel.TextLabel_Property_TEXT_FIT_get(); - internal static readonly int MIN_LINE_SIZE = Interop.TextLabel.TextLabel_Property_MIN_LINE_SIZE_get(); } private void OnShadowColorChanged(float x, float y, float z, float w) -- 2.7.4