From 575762848baf2e3fff93443944c6250bd986585b Mon Sep 17 00:00:00 2001
From: "minho.sun" <minho.sun@samsung.com>
Date: Mon, 14 Aug 2017 17:10:22 +0900
Subject: [PATCH] [Tizen] add Name in Layer, LineCount in TextLabel

This reverts commit a941a950b780446bfbb7b7901e3cfc73f9f0f24f.

Change-Id: If6ff37dc4f776d3059c3058cdd4cd012924aef78
---
 Tizen.NUI/Tizen.NUI.csproj                       |   4 +-
 Tizen.NUI/TizenTVNUI.snk                         | Bin 0 -> 596 bytes
 Tizen.NUI/src/public/BaseComponents/TextLabel.cs |  14 ++++++-
 Tizen.NUI/src/public/Layer.cs                    |  47 +++++++++++++++++++++++
 4 files changed, 62 insertions(+), 3 deletions(-)
 create mode 100755 Tizen.NUI/TizenTVNUI.snk

diff --git a/Tizen.NUI/Tizen.NUI.csproj b/Tizen.NUI/Tizen.NUI.csproj
index 120e69a..5d1c7b0 100755
--- a/Tizen.NUI/Tizen.NUI.csproj
+++ b/Tizen.NUI/Tizen.NUI.csproj
@@ -16,9 +16,9 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard1.6</TargetFramework>
-    <DefineConstants>$(DefineConstants);DEBUG_ON;DOT_NET_CORE</DefineConstants>
+    <DefineConstants>$(DefineConstants)DEBUG_ON</DefineConstants>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <SignAssembly>False</SignAssembly>
+    <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>TizenTVNUI.snk</AssemblyOriginatorKeyFile>
     <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
   </PropertyGroup>
diff --git a/Tizen.NUI/TizenTVNUI.snk b/Tizen.NUI/TizenTVNUI.snk
new file mode 100755
index 0000000000000000000000000000000000000000..957e8d4291ea37f8a12179b82d2bf2aa9a91bb65
GIT binary patch
literal 596
zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50098)L|iJEjWxNRS7!7s?=#q)A7>(6uu<?4
ztIy6yq<DyR!<SH^<!N6Y!58!$mSF@Lffr(CpO_OJvkGox#=DQ+H!<^b_RXZg2z?SC
zQ3zF^A#K1FfPKVn#iY@;KV9$kOaXOD4Y1sVo5KKSC34HsX>>BHY#BbkpRMM<4=Sy7
z4MAA@q1A+zm$1_DArKk{4;^AvJ=xg!7Z@;1l^=gsJW&4(m&g=PW*@N@zh=5hnh6L^
zBIxKy^eQ~9D|XeH5=B^-jD!;aTaBQ+q5a6}=SQaM>+R9Z67E%5=|rbiTQ^D0f{z8Q
zJ<elKUXFoOyw7>9$kahz1m(D(8?4V|!}<(jiYP7t(o&q=pRs!CAjI8h?-B!7PnP08
zsVVdv2V=?}gf%>vxXGK(r-7#Zu9KX$kM%kQFiXMvb#hh-Iv8JfH~N_tj)rbKrpq`7
z-}xgBMT_hM6PYNU->hzejZ0wikeWPiK<483PR+0nUZg%D!6Dh0RBhTSj!d8k%TF&P
zArWG-S`))=qh`=?X`PsRdn}_{bh;zX=VU$I6Y*;yEu!V=_#opj9ZEeoc~3$&;wl#E
zRc$zsbgY>HKUvx-9)cM`ri(t3vH|EXc^bOEHK8h4GxO?;I*y*dc)@Llgbp?73gZ4;
zU#NV{Xd5Us)s@8+2<g-ZAw<s>gQ^m-%uxq*a!d&ZhL+740b<~&5iF~cO20s;rnBno
i0s?OA*a~jf&Gn;FARp<QPl=#TCu+Udpn`T2tu{wR#1cFJ

literal 0
HcmV?d00001

diff --git a/Tizen.NUI/src/public/BaseComponents/TextLabel.cs b/Tizen.NUI/src/public/BaseComponents/TextLabel.cs
index 0339ac0..20598db 100755
--- 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
--- 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"
     }
 }
-- 
2.7.4