From ca3c572c2e811c28993d41e03db538c24b735728 Mon Sep 17 00:00:00 2001 From: "dongsug.song" Date: Tue, 13 Jun 2017 16:42:47 +0900 Subject: [PATCH] Revert "[Tizen] manual binding for TextEditor and ApplicationExtension" This reverts commit 13ccdb3dba92564f9f3e5a4d32ddca44963f70d4. Change-Id: Iaec3ae52abab491c962fba8d4fd1a6a6af2b16b0 --- .../NUISamples.TizenTV/examples/text-test.cs | 12 ----- Tizen.NUI/src/internal/ApplicationExtensions.cs | 6 --- Tizen.NUI/src/internal/ManualPINVOKE.cs | 9 ---- Tizen.NUI/src/internal/NDalicPINVOKE.cs | 3 -- Tizen.NUI/src/public/BaseComponents/TextEditor.cs | 51 ---------------------- Tizen.NUI/src/public/BaseComponents/View.cs | 12 ----- Tizen.NUI/src/public/NUIApplication.cs | 1 - 7 files changed, 94 deletions(-) diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/text-test.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/text-test.cs index d524397..a00a794 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/text-test.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/text-test.cs @@ -90,18 +90,6 @@ namespace TextTest hiddenMap.Add(HiddenInputProperty.SubstituteCharacter, new PropertyValue(0x23)); field.HiddenInputSettings = hiddenMap; window.GetDefaultLayer().Add(field); - TextEditor editor = new TextEditor(); - editor.Size2D = new Size2D(400, 100); - editor.Position2D = new Position2D(10, 550); - editor.BackgroundColor = Color.Magenta; - editor.PlaceholderText = "input someth..."; - editor.PlaceholderTextColor = Color.Red; - window.GetDefaultLayer().Add(editor); - editor.TextChanged += (obj, e) => { - Tizen.Log.Debug("NUI", "editor line count: " + e.TextEditor.LineCount); - }; - - Tizen.Log.Debug("NUI", "editor id: " + editor.ID); } [STAThread] diff --git a/Tizen.NUI/src/internal/ApplicationExtensions.cs b/Tizen.NUI/src/internal/ApplicationExtensions.cs index 12a8e2c..8dd3e3b 100755 --- a/Tizen.NUI/src/internal/ApplicationExtensions.cs +++ b/Tizen.NUI/src/internal/ApplicationExtensions.cs @@ -109,12 +109,6 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void Start() - { - NDalicPINVOKE.ApplicationExtensions_Start(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - public void Terminate() { NDalicPINVOKE.ApplicationExtensions_Terminate(swigCPtr); diff --git a/Tizen.NUI/src/internal/ManualPINVOKE.cs b/Tizen.NUI/src/internal/ManualPINVOKE.cs index 5669090..86da201 100755 --- a/Tizen.NUI/src/internal/ManualPINVOKE.cs +++ b/Tizen.NUI/src/internal/ManualPINVOKE.cs @@ -566,15 +566,6 @@ namespace Tizen.NUI [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_TextEditor_Property_PIXEL_SIZE_get")] public static extern int TextEditor_Property_PIXEL_SIZE_get(); - [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_TextEditor_Property_LINE_COUNT_get")] - public static extern int TextEditor_Property_LINE_COUNT_get(); - - [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_TextEditor_Property_PLACEHOLDER_TEXT_get")] - public static extern int TextEditor_Property_PLACEHOLDER_TEXT_get(); - - [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_TextEditor_Property_PLACEHOLDER_TEXT_COLOR_get")] - public static extern int TextEditor_Property_PLACEHOLDER_TEXT_COLOR_get(); - [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_TextField_Property_HIDDEN_INPUT_SETTINGS_get")] public static extern int TextField_Property_HIDDEN_INPUT_SETTINGS_get(); diff --git a/Tizen.NUI/src/internal/NDalicPINVOKE.cs b/Tizen.NUI/src/internal/NDalicPINVOKE.cs index b761dd2..6268803 100755 --- a/Tizen.NUI/src/internal/NDalicPINVOKE.cs +++ b/Tizen.NUI/src/internal/NDalicPINVOKE.cs @@ -6115,9 +6115,6 @@ class NDalicPINVOKE { [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_ApplicationExtensions_Init")] public static extern void ApplicationExtensions_Init(global::System.Runtime.InteropServices.HandleRef jarg1); - [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_ApplicationExtensions_Start")] - public static extern void ApplicationExtensions_Start(global::System.Runtime.InteropServices.HandleRef jarg1); - [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_ApplicationExtensions_Terminate")] public static extern void ApplicationExtensions_Terminate(global::System.Runtime.InteropServices.HandleRef jarg1); diff --git a/Tizen.NUI/src/public/BaseComponents/TextEditor.cs b/Tizen.NUI/src/public/BaseComponents/TextEditor.cs index c49d3df..0b06475 100755 --- a/Tizen.NUI/src/public/BaseComponents/TextEditor.cs +++ b/Tizen.NUI/src/public/BaseComponents/TextEditor.cs @@ -291,10 +291,6 @@ namespace Tizen.NUI.BaseComponents internal static readonly int SCROLL_BAR_SHOW_DURATION = NDalicManualPINVOKE.TextEditor_Property_SCROLL_BAR_SHOW_DURATION_get(); internal static readonly int SCROLL_BAR_FADE_DURATION = NDalicManualPINVOKE.TextEditor_Property_SCROLL_BAR_FADE_DURATION_get(); internal static readonly int PIXEL_SIZE = NDalicManualPINVOKE.TextEditor_Property_PIXEL_SIZE_get(); - internal static readonly int LINE_COUNT = NDalicManualPINVOKE.TextEditor_Property_LINE_COUNT_get(); - internal static readonly int PLACEHOLDER_TEXT = NDalicManualPINVOKE.TextEditor_Property_PLACEHOLDER_TEXT_get(); - internal static readonly int PLACEHOLDER_TEXT_COLOR = NDalicManualPINVOKE.TextEditor_Property_PLACEHOLDER_TEXT_COLOR_get(); - } @@ -1274,53 +1270,6 @@ namespace Tizen.NUI.BaseComponents } } - /// - /// The line count of text. - /// - public int LineCount - { - get - { - int temp = 0; - GetProperty(TextEditor.Property.LINE_COUNT).Get(out temp); - return temp; - } - } - - /// - /// The text to display when the TextEditor is empty and inactive. - /// - public string PlaceholderText - { - get - { - string temp; - GetProperty(TextEditor.Property.PLACEHOLDER_TEXT).Get(out temp); - return temp; - } - set - { - SetProperty(TextEditor.Property.PLACEHOLDER_TEXT, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// The placeholder-text color. - /// - public Color PlaceholderTextColor - { - get - { - Color temp = new Color(0.0f, 0.0f, 0.0f, 0.0f); - GetProperty(TextEditor.Property.PLACEHOLDER_TEXT_COLOR).Get(temp); - return temp; - } - set - { - SetProperty(TextEditor.Property.PLACEHOLDER_TEXT_COLOR, new Tizen.NUI.PropertyValue(value)); - } - } - } } diff --git a/Tizen.NUI/src/public/BaseComponents/View.cs b/Tizen.NUI/src/public/BaseComponents/View.cs index 9f4a057..082a9f5 100755 --- a/Tizen.NUI/src/public/BaseComponents/View.cs +++ b/Tizen.NUI/src/public/BaseComponents/View.cs @@ -3383,18 +3383,6 @@ namespace Tizen.NUI.BaseComponents } /// - /// Gets the View's ID. - /// Readonly - /// - public uint ID - { - get - { - return GetId(); - } - } - - /// /// Gets/Sets the status of whether an view should emit touch or hover signals. /// public bool Sensitive diff --git a/Tizen.NUI/src/public/NUIApplication.cs b/Tizen.NUI/src/public/NUIApplication.cs index 7411f0c..420c1ce 100755 --- a/Tizen.NUI/src/public/NUIApplication.cs +++ b/Tizen.NUI/src/public/NUIApplication.cs @@ -133,7 +133,6 @@ namespace Tizen.NUI } _applicationExt = new ApplicationExtensions(_application); _applicationExt.Init(); - _applicationExt.Start(); // This is also required to create DisposeQueue on main thread. disposeQ.Initialize(); -- 2.7.4