manual binding for TextEditor and ApplicationExtension 16/133616/1
authorxb.teng <xb.teng@samsung.com>
Tue, 13 Jun 2017 02:43:37 +0000 (10:43 +0800)
committerxb.teng <xb.teng@samsung.com>
Tue, 13 Jun 2017 02:43:44 +0000 (10:43 +0800)
There are changes:
1. Add properties LineCount/PlaceholderText/PlaceholderTextColor for TextEditor
2. Add property ID for View
3. Add api Start for ApplicationExtensions
4.  Update text sample to test new features.

Change-Id: Ie2138c383c1965b421255422a435fd7f16b231c3

NUISamples/NUISamples/NUISamples.TizenTV/examples/text-test.cs
Tizen.NUI/src/internal/ApplicationExtensions.cs
Tizen.NUI/src/internal/ManualPINVOKE.cs
Tizen.NUI/src/internal/NDalicPINVOKE.cs
Tizen.NUI/src/public/BaseComponents/TextEditor.cs
Tizen.NUI/src/public/BaseComponents/View.cs
Tizen.NUI/src/public/NUIApplication.cs

index 3530209..4648f1e 100755 (executable)
@@ -90,6 +90,19 @@ namespace TextTest
             hiddenMap.Add(HiddenInputProperty.SubstituteCharacter, new PropertyValue(0x23));
             field.HiddenInputSettings = hiddenMap;
             window.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.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]
index 8dd3e3b..12a8e2c 100755 (executable)
@@ -109,6 +109,12 @@ 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);
index 86da201..5669090 100755 (executable)
@@ -566,6 +566,15 @@ 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();
 
index e3377d7..7cff7dd 100755 (executable)
@@ -6124,6 +6124,9 @@ 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);
 
index f8d209e..2b7b678 100755 (executable)
@@ -207,6 +207,9 @@ 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();
 
         }
 
@@ -1071,6 +1074,53 @@ namespace Tizen.NUI.BaseComponents
             }
         }
 
+        /// <summary>
+        /// The line count of text.
+        /// </summary>
+        public int LineCount
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(TextEditor.Property.LINE_COUNT).Get(out temp);
+                return temp;
+            }
+        }
+
+        /// <summary>
+        /// The text to display when the TextEditor is empty and inactive.
+        /// </summary>
+        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));
+            }
+        }
+
+        /// <summary>
+        /// The placeholder-text color.
+        /// </summary>
+        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));
+            }
+        }
+
     }
 
 }
index 5ecda10..9499b4a 100755 (executable)
@@ -3116,6 +3116,18 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
+        /// Gets the View's ID.
+        /// Readonly
+        /// </summary>
+        public uint ID
+        {
+            get
+            {
+                return GetId();
+            }
+        }
+
+        /// <summary>
         /// Gets/Sets the status of whether an view should emit touch or hover signals.
         /// </summary>
         public bool Sensitive
index 420c1ce..7411f0c 100755 (executable)
@@ -133,6 +133,7 @@ namespace Tizen.NUI
             }
             _applicationExt = new ApplicationExtensions(_application);
             _applicationExt.Init();
+            _applicationExt.Start();
 
             // This is also required to create DisposeQueue on main thread.
             disposeQ.Initialize();