From: Adeel Kazmi Date: Tue, 3 Oct 2017 18:15:59 +0000 (+0100) Subject: Changes required after TextLabel Devel properties were made public X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=37296affe6bb3e1f869d522a82edac584af6eefd;p=platform%2Fcore%2Fcsapi%2Fnui.git Changes required after TextLabel Devel properties were made public Conflicts: Tizen.NUI/src/public/BaseComponents/TextLabel.cs Change-Id: I84627df3ee0bceaca7152ee356d7bb4de47aeed5 --- diff --git a/Tizen.NUI/src/internal/NDalicPINVOKE.cs b/Tizen.NUI/src/internal/NDalicPINVOKE.cs index eb3584d..cf9662c 100755 --- a/Tizen.NUI/src/internal/NDalicPINVOKE.cs +++ b/Tizen.NUI/src/internal/NDalicPINVOKE.cs @@ -9322,9 +9322,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 32ca8f3..5bbe44d 100755 --- a/Tizen.NUI/src/public/BaseComponents/TextLabel.cs +++ b/Tizen.NUI/src/public/BaseComponents/TextLabel.cs @@ -388,6 +388,8 @@ namespace Tizen.NUI.BaseComponents /// /// The TextColor property.
/// The color of the text.
+ /// Animation framework can be used to change the color of the text when not using mark up.
+ /// Cannot animate the color when text is auto scrolling.
///
public Color TextColor { @@ -757,25 +759,6 @@ namespace Tizen.NUI.BaseComponents } /// - /// The TextColorAnimatable property.
- /// The color of the text that can be animatated.
- /// Animation framework can be used to change the color of the text when not using mark up.
- /// Not possible when text is auto scrolling.
- ///
- 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)); - } - } - /// The line count of the text. /// public int LineCount