From bb0612e1b86df21029ffb8cbf9c54b79636df1a4 Mon Sep 17 00:00:00 2001 From: "minho.sun" Date: Mon, 14 Aug 2017 16:44:50 +0900 Subject: [PATCH] Revert "[Tizen] Animatable TextColor Property for TextLabel" This reverts commit 349a7c83bd3adaf40cc28895cc181388b04f349f. Change-Id: I1ef1fba408c217cfa5bf6bc0da0219d088809ea0 --- .../NUISamples.TizenTV/examples/hello-world.cs | 48 ++++++---------------- Tizen.NUI/src/internal/NDalicPINVOKE.cs | 3 -- Tizen.NUI/src/public/BaseComponents/TextLabel.cs | 22 ---------- 3 files changed, 12 insertions(+), 61 deletions(-) diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-world.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-world.cs index 626a48e..8cd8f1d 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-world.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-world.cs @@ -49,9 +49,6 @@ namespace HelloWorldTest Initialize(); } - TextLabel pixelLabel; - TextLabel pointLabel; - public void Initialize() { Window window = Window.Instance; @@ -60,16 +57,16 @@ namespace HelloWorldTest window.KeyEvent += OnWindowKeyEvent; window.Resized += (obj, e) => { - Tizen.Log.Fatal("NUI", "Height: " + e.WindowSize.Height); - Tizen.Log.Fatal("NUI", "Width: " + e.WindowSize.Width); + Tizen.Log.Debug("NUI", "Height: " + e.WindowSize.Height); + Tizen.Log.Debug("NUI", "Width: " + e.WindowSize.Width); }; - pixelLabel = new TextLabel("Test Pixel Size 32.0f"); + TextLabel pixelLabel = new TextLabel("Test Pixel Size 32.0f"); pixelLabel.Position2D = new Position2D(10, 10); pixelLabel.PixelSize = 32.0f; window.Add(pixelLabel); - pointLabel = new TextLabel("Test Point Size 32.0f"); + TextLabel pointLabel = new TextLabel("Test Point Size 32.0f"); pointLabel.Position2D = new Position2D(10, 100); pointLabel.PointSize = 32.0f; window.Add(pointLabel); @@ -101,7 +98,7 @@ namespace HelloWorldTest _view = new View(); _view.Size2D = new Size2D(100, 100); _view.SizeWidth = 50; - Tizen.Log.Fatal("NUI", "[1]_view SizeWidth=" + _view.SizeWidth); + Tizen.Log.Debug("NUI", "[1]_view SizeWidth=" + _view.SizeWidth); _animation = new Animation { @@ -115,25 +112,22 @@ namespace HelloWorldTest _animation.Finished += AnimationFinished; _view.SizeWidth = 50; - Tizen.Log.Fatal("NUI", "[2]_view SizeWidth=" + _view.SizeWidth); + Tizen.Log.Debug("NUI", "[2]_view SizeWidth=" + _view.SizeWidth); } public void AnimationFinished(object sender, EventArgs e) { - Tizen.Log.Fatal("NUI", "AnimationFinished()! cnt=" + (cnt)); + Tizen.Log.Debug("NUI", "AnimationFinished()! cnt=" + (cnt)); if (_animation) { - Tizen.Log.Fatal("NUI", "Duration= " + _animation.Duration + "EndAction= " + _animation.EndAction); + Tizen.Log.Debug("NUI", "Duration= " + _animation.Duration + "EndAction= " + _animation.EndAction); } _view.SizeWidth = 50; - Tizen.Log.Fatal("NUI", "[3]_view SizeWidth=" + _view.SizeWidth); + Tizen.Log.Debug("NUI", "[3]_view SizeWidth=" + _view.SizeWidth); } public void OnWindowKeyEvent(object sender, Window.KeyEventArgs e) { - Tizen.Log.Fatal("NUI", "e.Key.KeyPressedName=" + e.Key.KeyPressedName); - - if (e.Key.State == Key.StateType.Down) { if (e.Key.KeyPressedName == "Up") @@ -142,11 +136,8 @@ namespace HelloWorldTest { _animation.Finished += AnimationFinished; cnt++; - Tizen.Log.Fatal("NUI", "AnimationFinished added!"); + Tizen.Log.Debug("NUI", "AnimationFinished added!"); } - pointLabel.TextColorAnimatable = Color.Blue; - pixelLabel.TextColorAnimatable = Color.Blue; - } else if (e.Key.KeyPressedName == "Down") { @@ -154,26 +145,11 @@ namespace HelloWorldTest { _animation.Finished -= AnimationFinished; cnt--; - Tizen.Log.Fatal("NUI", "AnimationFinished removed!"); + Tizen.Log.Debug("NUI", "AnimationFinished removed!"); } - pointLabel.TextColorAnimatable = Color.Red; - pixelLabel.TextColorAnimatable = Color.Red; - } - else if (e.Key.KeyPressedName == "Return") - { - if (_animation) - { - //_animation.Stop(Dali.Constants.Animation.EndAction.Stop); - //_animation.Reset(); - } - _animation.Play(); - Tizen.Log.Fatal("NUI", "_animation play here!"); - } } - } - public void OnWindowTouched(object sender, Window.TouchEventArgs e) { @@ -191,7 +167,7 @@ namespace HelloWorldTest [STAThread] static void _Main(string[] args) { - Tizen.Log.Fatal("NUI", "Main() called!"); + //Tizen.Log.Debug("NUI", "Main() called!"); Example example = new Example(); example.Run(args); } diff --git a/Tizen.NUI/src/internal/NDalicPINVOKE.cs b/Tizen.NUI/src/internal/NDalicPINVOKE.cs index 1939974..6e3640e 100755 --- a/Tizen.NUI/src/internal/NDalicPINVOKE.cs +++ b/Tizen.NUI/src/internal/NDalicPINVOKE.cs @@ -9281,9 +9281,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 7390f4f..ac37acf 100755 --- a/Tizen.NUI/src/public/BaseComponents/TextLabel.cs +++ b/Tizen.NUI/src/public/BaseComponents/TextLabel.cs @@ -103,8 +103,6 @@ namespace Tizen.NUI.BaseComponents internal static readonly int AUTO_SCROLL_LOOP_DELAY = NDalicManualPINVOKE.TextLabel_Property_AUTO_SCROLL_LOOP_DELAY_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(); - internal static readonly int TEXT_COLOR_ANIMATABLE = NDalicPINVOKE.TextLabel_Property_TEXT_COLOR_ANIMATABLE_get(); - } /// @@ -135,7 +133,6 @@ namespace Tizen.NUI.BaseComponents public new static TextLabel DownCast(BaseHandle handle) { TextLabel ret = Registry.GetManagedBaseHandleFromNativePtr(handle) as TextLabel; - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } @@ -768,24 +765,5 @@ namespace Tizen.NUI.BaseComponents } } - /// 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)); - } - } - } } -- 2.7.4