From ce497f5592cd28b15a228253241a8b2e8748e485 Mon Sep 17 00:00:00 2001 From: "dongsug.song" Date: Tue, 25 Jul 2017 10:43:16 +0900 Subject: [PATCH] Revert "[Tizen] add Name in Layer, LineCount in TextLabel" This reverts commit e3e0f1e9d09079dff6827df8daa8265215b90557. Change-Id: I59fac2947f0deb959be1c935ca8ccf945d122856 --- src/Tizen.NUI/Tizen.NUI.csproj | 4 +-- src/Tizen.NUI/TizenTVNUI.snk | Bin 596 -> 0 bytes .../src/public/BaseComponents/TextLabel.cs | 15 +---------- src/Tizen.NUI/src/public/Layer.cs | 30 --------------------- 4 files changed, 3 insertions(+), 46 deletions(-) delete mode 100755 src/Tizen.NUI/TizenTVNUI.snk diff --git a/src/Tizen.NUI/Tizen.NUI.csproj b/src/Tizen.NUI/Tizen.NUI.csproj index 4242bba..78b5739 100755 --- a/src/Tizen.NUI/Tizen.NUI.csproj +++ b/src/Tizen.NUI/Tizen.NUI.csproj @@ -16,9 +16,9 @@ netstandard1.6 - $(DefineConstants)DEBUG_ON + $(DefineConstants);DEBUG_ON;DOT_NET_CORE True - True + False TizenTVNUI.snk true diff --git a/src/Tizen.NUI/TizenTVNUI.snk b/src/Tizen.NUI/TizenTVNUI.snk deleted file mode 100755 index 957e8d4291ea37f8a12179b82d2bf2aa9a91bb65..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50098)L|iJEjWxNRS7!7s?=#q)A7>(6uu>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 zJ9$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+2gQ^m-%uxq*a!d&ZhL+740b<~&5iF~cO20s;rnBno i0s?OA*a~jf&Gn;FARp @@ -708,18 +708,5 @@ namespace Tizen.NUI.BaseComponents } } - /// - /// The line count of text. - /// - public int LineCount - { - get - { - int temp = 0; - GetProperty(TextLabel.Property.LINE_COUNT).Get(out temp); - return temp; - } - } - } } diff --git a/src/Tizen.NUI/src/public/Layer.cs b/src/Tizen.NUI/src/public/Layer.cs index 84daa09..02d9adc 100755 --- a/src/Tizen.NUI/src/public/Layer.cs +++ b/src/Tizen.NUI/src/public/Layer.cs @@ -378,35 +378,5 @@ namespace Tizen.NUI return ret; } } - - /// - /// Gets/Sets the Layer's name. - /// - 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(); - } } } -- 2.7.4