[Tizen] add Name in Layer, LineCount in TextLabel

This reverts commit a941a950b780446bfbb7b7901e3cfc73f9f0f24f.

Change-Id: If6ff37dc4f776d3059c3058cdd4cd012924aef78

diff --git a/Tizen.NUI/Tizen.NUI.csproj b/Tizen.NUI/Tizen.NUI.csproj
index 120e69a..5d1c7b0 100755 (executable)
--- a/Tizen.NUI/Tizen.NUI.csproj
+++ b/Tizen.NUI/Tizen.NUI.csproj
@@ -16,9 +16,9 @@
 \r
   <PropertyGroup>\r
     <TargetFramework>netstandard1.6</TargetFramework>\r
-    <DefineConstants>$(DefineConstants);DEBUG_ON;DOT_NET_CORE</DefineConstants>\r
+    <DefineConstants>$(DefineConstants)DEBUG_ON</DefineConstants>\r
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>\r
-    <SignAssembly>False</SignAssembly>\r
+    <SignAssembly>True</SignAssembly>\r
     <AssemblyOriginatorKeyFile>TizenTVNUI.snk</AssemblyOriginatorKeyFile>\r
     <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>\r
   </PropertyGroup>\r

diff --git a/Tizen.NUI/TizenTVNUI.snk b/Tizen.NUI/TizenTVNUI.snk
new file mode 100755 (executable)
index 0000000..957e8d4
Binary files /dev/null and b/Tizen.NUI/TizenTVNUI.snk differ

diff --git a/Tizen.NUI/src/public/BaseComponents/TextLabel.cs b/Tizen.NUI/src/public/BaseComponents/TextLabel.cs
index 0339ac0..20598db 100755 (executable)
--- a/Tizen.NUI/src/public/BaseComponents/TextLabel.cs
+++ b/Tizen.NUI/src/public/BaseComponents/TextLabel.cs
@@ -102,7 +102,7 @@ namespace Tizen.NUI.BaseComponents
             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 = OUTLINE + 5;
         }
 
         /// <summary>
@@ -728,5 +728,17 @@ namespace Tizen.NUI.BaseComponents
                 SetProperty(TextLabel.Property.TEXT_COLOR_ANIMATABLE, new Tizen.NUI.PropertyValue(value));
             }
         }
+
+        /// The line count of text.
+        /// </summary>
+        public int LineCount
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(TextLabel.Property.LINE_COUNT).Get(out temp);
+                return temp;
+            }
+        }
     }
 }

diff --git a/Tizen.NUI/src/public/Layer.cs b/Tizen.NUI/src/public/Layer.cs
index 1e8c5af..165b170 100755 (executable)
--- a/Tizen.NUI/src/public/Layer.cs
+++ b/Tizen.NUI/src/public/Layer.cs
@@ -431,5 +431,52 @@ namespace Tizen.NUI
                 SetProperty(View.Property.VISIBLE, new Tizen.NUI.PropertyValue(value));
             }
         }
+<<<<<<< HEAD
+=======
+
+        /// <summary>
+        /// Get the number of children held by the layer.
+        /// </summary>
+        public uint ChildCount
+        {
+            get
+            {
+                uint ret = NDalicPINVOKE.Actor_GetChildCount(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending)
+                    throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the Layer's name.
+        /// </summary>
+        public string Name
+        {
+            get
+            {
+                return GetName();
+            }
+            set
+            {
+                SetName(value);
+            }
+        }
+
+        internal string GetName()
+        {
+            string ret = NDalicPINVOKE.Actor_GetName(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetName(string name)
+        {
+            NDalicPINVOKE.Actor_SetName(swigCPtr, name);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+>>>>>>> parent of a941a95... Revert "[Tizen] add Name in Layer, LineCount in TextLabel"
     }
 }