diff options
| author | Adeel Kazmi <adeel.kazmi@samsung.com> | 2017-10-03 19:15:59 +0100 |
|---|---|---|
| committer | Adeel Kazmi <adeel.kazmi@samsung.com> | 2017-10-04 10:47:24 +0100 |
| commit | 960525b02896af07183dd6e8cca1765b988195a2 (patch) | |
| tree | b77ffaf7c4d68f7974da0c87416b1365797db00a | |
| parent | d5886773b7b522997988b14c11ea5a0e12e55d74 (diff) | |
| download | nui-960525b02896af07183dd6e8cca1765b988195a2.tar.gz nui-960525b02896af07183dd6e8cca1765b988195a2.tar.bz2 nui-960525b02896af07183dd6e8cca1765b988195a2.zip | |
Changes required after TextLabel Devel properties were made public
Change-Id: I84627df3ee0bceaca7152ee356d7bb4de47aeed5
| -rwxr-xr-x | Tizen.NUI/src/internal/NDalicPINVOKE.cs | 3 | ||||
| -rwxr-xr-x | Tizen.NUI/src/public/BaseComponents/TextLabel.cs | 23 |
2 files changed, 2 insertions, 24 deletions
diff --git a/Tizen.NUI/src/internal/NDalicPINVOKE.cs b/Tizen.NUI/src/internal/NDalicPINVOKE.cs index c0c64dc..728cea5 100755 --- a/Tizen.NUI/src/internal/NDalicPINVOKE.cs +++ b/Tizen.NUI/src/internal/NDalicPINVOKE.cs @@ -9269,9 +9269,6 @@ class NDalicPINVOKE { [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_TextLabel_Property_TEXT_COLOR_get")] public static extern int TextLabel_Property_TEXT_COLOR_get(); - [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_TextLabel_Property_TEXT_COLOR_ANIMATABLE_get")] - public static extern int TextLabel_Property_TEXT_COLOR_ANIMATABLE_get(); - [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_TextLabel_Property_SHADOW_OFFSET_get")] public static extern int TextLabel_Property_SHADOW_OFFSET_get(); diff --git a/Tizen.NUI/src/public/BaseComponents/TextLabel.cs b/Tizen.NUI/src/public/BaseComponents/TextLabel.cs index f71b2e7..01a61fe 100755 --- a/Tizen.NUI/src/public/BaseComponents/TextLabel.cs +++ b/Tizen.NUI/src/public/BaseComponents/TextLabel.cs @@ -101,7 +101,6 @@ namespace Tizen.NUI.BaseComponents internal static readonly int ELLIPSIS = NDalicManualPINVOKE.TextLabel_Property_ELLIPSIS_get(); internal static readonly int AUTO_SCROLL_STOP_MODE = NDalicManualPINVOKE.TextLabel_Property_AUTO_SCROLL_STOP_MODE_get(); internal static readonly int AUTO_SCROLL_LOOP_DELAY = NDalicManualPINVOKE.TextLabel_Property_AUTO_SCROLL_LOOP_DELAY_get(); - internal static readonly int TEXT_COLOR_ANIMATABLE = NDalicPINVOKE.TextLabel_Property_TEXT_COLOR_ANIMATABLE_get(); internal static readonly int LINE_COUNT = NDalicManualPINVOKE.TextLabel_Property_LINE_COUNT_get(); internal static readonly int LINE_WRAP_MODE = NDalicManualPINVOKE.TextLabel_Property_LINE_WRAP_MODE_get(); } @@ -342,6 +341,8 @@ namespace Tizen.NUI.BaseComponents /// <summary> /// TextColor property.<br> /// The color of the text.<br> + /// Animation framework can be used to change the color of the text when not using mark up.<br> + /// Cannot animate the color when text is auto scrolling.<br> /// </summary> public Color TextColor { @@ -719,26 +720,6 @@ namespace Tizen.NUI.BaseComponents } /// <summary> - /// TextColorAnimatable property.<br> - /// The color of the text that can be animatated.<br> - /// Animation framework can be used to change the color of the text when not using mark up.<br> - /// Not possible when text is auto scrolling. <br> - /// </summary> - public Color TextColorAnimatable - { - get - { - Color animatableColor = new Color(0.0f, 0.0f, 0.0f, 0.0f); - GetProperty(TextLabel.Property.TEXT_COLOR_ANIMATABLE).Get(animatableColor); - return animatableColor; - } - set - { - SetProperty(TextLabel.Property.TEXT_COLOR_ANIMATABLE, new Tizen.NUI.PropertyValue(value)); - } - } - - /// <summary> /// The line count of text. /// </summary> public int LineCount |