From 6d943cd0d04e38d92b419fe054226427c84249e7 Mon Sep 17 00:00:00 2001 From: Shrouq Sabah Date: Mon, 5 Jul 2021 17:11:03 +0300 Subject: [PATCH] Changed EllipsisLocation to EllipsisPosition, removed unneeded tags and modified Tizen API Level to 9 --- .../src/internal/Interop/Interop.TextEditor.cs | 4 ++-- .../src/internal/Interop/Interop.TextField.cs | 4 ++-- .../src/internal/Interop/Interop.TextLabel.cs | 4 ++-- .../public/BaseComponents/Style/TextLabelStyle.cs | 14 ++++++------- .../src/public/BaseComponents/TextEditor.cs | 23 ++++++---------------- .../BaseComponents/TextEditorBindableProperty.cs | 8 ++++---- .../src/public/BaseComponents/TextField.cs | 16 +++++++++++++++ .../BaseComponents/TextFieldBindableProperty.cs | 8 ++++---- .../src/public/BaseComponents/TextLabel.cs | 8 ++++---- .../BaseComponents/TextLabelBindableProperty.cs | 8 ++++---- src/Tizen.NUI/src/public/Common/NUIConstants.cs | 21 ++------------------ 11 files changed, 53 insertions(+), 65 deletions(-) diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.TextEditor.cs b/src/Tizen.NUI/src/internal/Interop/Interop.TextEditor.cs index e545ff9..1512563 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.TextEditor.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.TextEditor.cs @@ -305,8 +305,8 @@ namespace Tizen.NUI [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_TextEditor_Property_ELLIPSIS_get")] public static extern int EllipsisGet(); - [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_TextEditor_Property_ELLIPSIS_LOCATION_get")] - public static extern int EllipsisLocationGet(); + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_TextEditor_Property_ELLIPSIS_POSITION_get")] + public static extern int EllipsisPositionGet(); } } } diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.TextField.cs b/src/Tizen.NUI/src/internal/Interop/Interop.TextField.cs index e0edf58..3be4719 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.TextField.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.TextField.cs @@ -244,8 +244,8 @@ namespace Tizen.NUI [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_TextField_Property_ELLIPSIS_get")] public static extern int EllipsisGet(); - [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_TextField_Property_ELLIPSIS_LOCATION_get")] - public static extern int EllipsisLocationGet(); + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_TextField_Property_ELLIPSIS_POSITION_get")] + public static extern int EllipsisPositionGet(); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_TextField_SelectWholeText")] public static extern void SelectWholeText(global::System.Runtime.InteropServices.HandleRef jarg1); diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.TextLabel.cs b/src/Tizen.NUI/src/internal/Interop/Interop.TextLabel.cs index 099b289..603c73a 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.TextLabel.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.TextLabel.cs @@ -108,8 +108,8 @@ namespace Tizen.NUI [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_TextLabel_Property_ELLIPSIS_get")] public static extern int EllipsisGet(); - [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_TextLabel_Property_ELLIPSIS_LOCATION_get")] - public static extern int EllipsisLocationGet(); + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_TextLabel_Property_ELLIPSIS_POSITION_get")] + public static extern int EllipsisPositionGet(); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_TextLabel_Property_LINE_COUNT_get")] public static extern int LineCountGet(); diff --git a/src/Tizen.NUI/src/public/BaseComponents/Style/TextLabelStyle.cs b/src/Tizen.NUI/src/public/BaseComponents/Style/TextLabelStyle.cs index 00759ca..7c8dc2d 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/Style/TextLabelStyle.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/Style/TextLabelStyle.cs @@ -269,15 +269,15 @@ namespace Tizen.NUI.BaseComponents }); /// This will be public opened in tizen_6.5 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] - public static readonly BindableProperty EllipsisLocationProperty = BindableProperty.Create(nameof(EllipsisLocation), typeof(EllipsisLocation?), typeof(TextLabelStyle), null, propertyChanged: (bindable, oldValue, newValue) => + public static readonly BindableProperty EllipsisPositionProperty = BindableProperty.Create(nameof(EllipsisPosition), typeof(EllipsisPosition?), typeof(TextLabelStyle), null, propertyChanged: (bindable, oldValue, newValue) => { var textLabelStyle = (TextLabelStyle)bindable; - textLabelStyle.ellipsisLocation = (EllipsisLocation?)newValue; + textLabelStyle.ellipsisPosition = (EllipsisPosition?)newValue; }, defaultValueCreator: (bindable) => { var textLabelStyle = (TextLabelStyle)bindable; - return textLabelStyle.ellipsisLocation; + return textLabelStyle.ellipsisPosition; }); /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -330,7 +330,7 @@ namespace Tizen.NUI.BaseComponents private AutoScrollStopMode? autoScrollStopMode; private LineWrapMode? lineWrapMode; private VerticalLineAlignment? verticalLineAlignment; - private EllipsisLocation? ellipsisLocation; + private EllipsisPosition? ellipsisPosition; private bool? matchSystemLanguageDirection; private Selector translatableTextSelector; private Selector fontFamilySelector; @@ -504,10 +504,10 @@ namespace Tizen.NUI.BaseComponents /// This will be public opened in tizen_6.5 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] - public EllipsisLocation? EllipsisLocation + public EllipsisPosition? EllipsisPosition { - get => (EllipsisLocation?)GetValue(EllipsisLocationProperty); - set => SetValue(EllipsisLocationProperty, value); + get => (EllipsisPosition?)GetValue(EllipsisPositionProperty); + set => SetValue(EllipsisPositionProperty, value); } /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs b/src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs index 638b082..ead9fc3 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs @@ -1338,12 +1338,7 @@ namespace Tizen.NUI.BaseComponents } } - /// - /// The Ellipsis property.
- /// Enable or disable the ellipsis.
- /// - /// 6.5 - /// This will be released at Tizen.NET API Level 6.5, so currently this would be used as inhouse API. + /// This will be released at Tizen.NET API Level 9, so currently this would be used as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] public bool Ellipsis { @@ -1358,23 +1353,17 @@ namespace Tizen.NUI.BaseComponents } } - /// - /// The ellipsis location of the text. - /// The ellipsis location type when the text size over the layout size.
- /// The ellipsis location: End, Start or Middle.
- /// - /// 6.5 - /// This will be released at Tizen.NET API Level 6.5, so currently this would be used as inhouse API. + /// This will be released at Tizen.NET API Level 9, so currently this would be used as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] - public EllipsisLocation EllipsisLocation + public EllipsisPosition EllipsisPosition { get { - return (EllipsisLocation)GetValue(EllipsisLocationProperty); + return (EllipsisPosition)GetValue(EllipsisPositionProperty); } set { - SetValue(EllipsisLocationProperty, value); + SetValue(EllipsisPositionProperty, value); NotifyPropertyChanged(); } } @@ -1832,7 +1821,7 @@ namespace Tizen.NUI.BaseComponents internal static readonly int EnableGrabHandlePopup = Interop.TextEditor.EnableGrabHandlePopupGet(); internal static readonly int InputMethodSettings = Interop.TextEditor.InputMethodSettingsGet(); internal static readonly int ELLIPSIS = Interop.TextEditor.EllipsisGet(); - internal static readonly int EllipsisLocation = Interop.TextEditor.EllipsisLocationGet(); + internal static readonly int EllipsisPosition = Interop.TextEditor.EllipsisPositionGet(); } internal class InputStyle diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextEditorBindableProperty.cs b/src/Tizen.NUI/src/public/BaseComponents/TextEditorBindableProperty.cs index b780f72..c6f6a5b 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/TextEditorBindableProperty.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/TextEditorBindableProperty.cs @@ -1043,20 +1043,20 @@ namespace Tizen.NUI.BaseComponents })); /// This will be public opened in tizen_6.5 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] - public static readonly BindableProperty EllipsisLocationProperty = BindableProperty.Create(nameof(EllipsisLocation), typeof(EllipsisLocation), typeof(TextEditor), EllipsisLocation.End, propertyChanged: (BindableProperty.BindingPropertyChangedDelegate)((bindable, oldValue, newValue) => + public static readonly BindableProperty EllipsisPositionProperty = BindableProperty.Create(nameof(EllipsisPosition), typeof(EllipsisPosition), typeof(TextEditor), EllipsisPosition.End, propertyChanged: (BindableProperty.BindingPropertyChangedDelegate)((bindable, oldValue, newValue) => { var textEditor = (TextEditor)bindable; if (newValue != null) { - Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EllipsisLocation, new Tizen.NUI.PropertyValue((int)newValue)); + Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EllipsisPosition, new Tizen.NUI.PropertyValue((int)newValue)); } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; int temp = 0; - Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EllipsisLocation).Get(out temp); - return (EllipsisLocation)temp; + Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EllipsisPosition).Get(out temp); + return (EllipsisPosition)temp; })); } } diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextField.cs b/src/Tizen.NUI/src/public/BaseComponents/TextField.cs index 0c9de99..ebfecb0 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/TextField.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/TextField.cs @@ -1348,6 +1348,21 @@ namespace Tizen.NUI.BaseComponents } } + /// This will be released at Tizen.NET API Level 9, so currently this would be used as inhouse API. + [EditorBrowsable(EditorBrowsableState.Never)] + public EllipsisPosition EllipsisPosition + { + get + { + return (EllipsisPosition)GetValue(EllipsisPositionProperty); + } + set + { + SetValue(EllipsisPositionProperty, value); + NotifyPropertyChanged(); + } + } + /// /// The Placeholder property. /// The placeholder map contains the following keys :
@@ -1833,6 +1848,7 @@ namespace Tizen.NUI.BaseComponents internal static readonly int PrimaryCursorPosition = Interop.TextField.PrimaryCursorPositionGet(); internal static readonly int FontSizeScale = Interop.TextField.FontSizeScaleGet(); internal static readonly int GrabHandleColor = Interop.TextField.GrabHandleColorGet(); + internal static readonly int EllipsisPosition = Interop.TextField.EllipsisPositionGet(); } internal class InputStyle diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextFieldBindableProperty.cs b/src/Tizen.NUI/src/public/BaseComponents/TextFieldBindableProperty.cs index 5d96c17..8d7cef6 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/TextFieldBindableProperty.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/TextFieldBindableProperty.cs @@ -954,20 +954,20 @@ namespace Tizen.NUI.BaseComponents })); /// This will be public opened in tizen_6.5 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] - public static readonly BindableProperty EllipsisLocationProperty = BindableProperty.Create(nameof(EllipsisLocation), typeof(EllipsisLocation), typeof(TextField), EllipsisLocation.End, propertyChanged: (BindableProperty.BindingPropertyChangedDelegate)((bindable, oldValue, newValue) => + public static readonly BindableProperty EllipsisPositionProperty = BindableProperty.Create(nameof(EllipsisPosition), typeof(EllipsisPosition), typeof(TextField), EllipsisPosition.End, propertyChanged: (BindableProperty.BindingPropertyChangedDelegate)((bindable, oldValue, newValue) => { var textField = (TextField)bindable; if (newValue != null) { - Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.EllipsisLocation, new Tizen.NUI.PropertyValue((int)newValue)); + Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.EllipsisPosition, new Tizen.NUI.PropertyValue((int)newValue)); } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; int temp = 0; - Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.EllipsisLocation).Get(out temp); - return (EllipsisLocation)temp; + Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.EllipsisPosition).Get(out temp); + return (EllipsisPosition)temp; })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs b/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs index 2e73c7a..d723c6d 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs @@ -789,15 +789,15 @@ namespace Tizen.NUI.BaseComponents /// 6.5 /// This will be released at Tizen.NET API Level 6.5, so currently this would be used as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] - public EllipsisLocation EllipsisLocation + public EllipsisPosition EllipsisPosition { get { - return (EllipsisLocation)GetValue(EllipsisLocationProperty); + return (EllipsisPosition)GetValue(EllipsisPositionProperty); } set { - SetValue(EllipsisLocationProperty, value); + SetValue(EllipsisPositionProperty, value); NotifyPropertyChanged(); } } @@ -1177,7 +1177,7 @@ namespace Tizen.NUI.BaseComponents internal static readonly int TextFit = Interop.TextLabel.TextFitGet(); internal static readonly int MinLineSize = Interop.TextLabel.MinLineSizeGet(); internal static readonly int FontSizeScale = Interop.TextLabel.FontSizeScaleGet(); - internal static readonly int EllipsisLocation = Interop.TextLabel.EllipsisLocationGet(); + internal static readonly int EllipsisPosition = Interop.TextLabel.EllipsisPositionGet(); } private void OnShadowColorChanged(float x, float y, float z, float w) diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextLabelBindableProperty.cs b/src/Tizen.NUI/src/public/BaseComponents/TextLabelBindableProperty.cs index a2e06f1..433469b 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/TextLabelBindableProperty.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/TextLabelBindableProperty.cs @@ -461,20 +461,20 @@ namespace Tizen.NUI.BaseComponents })); /// This will be public opened in tizen_6.5 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] - public static readonly BindableProperty EllipsisLocationProperty = BindableProperty.Create(nameof(EllipsisLocation), typeof(EllipsisLocation), typeof(TextLabel), EllipsisLocation.End, propertyChanged: (BindableProperty.BindingPropertyChangedDelegate)((bindable, oldValue, newValue) => + public static readonly BindableProperty EllipsisPositionProperty = BindableProperty.Create(nameof(EllipsisPosition), typeof(EllipsisPosition), typeof(TextLabel), EllipsisPosition.End, propertyChanged: (BindableProperty.BindingPropertyChangedDelegate)((bindable, oldValue, newValue) => { var textLabel = (TextLabel)bindable; if (newValue != null) { - Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.EllipsisLocation, new Tizen.NUI.PropertyValue((int)newValue)); + Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.EllipsisPosition, new Tizen.NUI.PropertyValue((int)newValue)); } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textLabel = (TextLabel)bindable; int temp = 0; - Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.EllipsisLocation).Get(out temp); - return (EllipsisLocation)temp; + Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.EllipsisPosition).Get(out temp); + return (EllipsisPosition)temp; })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] diff --git a/src/Tizen.NUI/src/public/Common/NUIConstants.cs b/src/Tizen.NUI/src/public/Common/NUIConstants.cs index d4874b2..a20e36c 100755 --- a/src/Tizen.NUI/src/public/Common/NUIConstants.cs +++ b/src/Tizen.NUI/src/public/Common/NUIConstants.cs @@ -883,28 +883,11 @@ namespace Tizen.NUI Bottom } - /// - /// An enum of ellipsis location. - /// - /// 6 - public enum EllipsisLocation + [EditorBrowsable(EditorBrowsableState.Never)] + public enum EllipsisPosition { - /// - /// ellipsis location at end. - /// - /// 6 End, - - /// - /// ellipsis location at start. - /// - /// 6 Start, - - /// - /// ellipsis location in middle. - /// - /// 6 Middle } -- 2.7.4