From 1e93cebcfddd5afe1d1899ec5f96d391e36e3992 Mon Sep 17 00:00:00 2001 From: "dongsug.song" Date: Tue, 7 Mar 2017 14:28:25 +0900 Subject: [PATCH] AnimationBetween() parameter changed and more - resolve crash issue : http://suprem.sec.samsung.net/jira/browse/NUI-66 crash - event handler pattern changed - Visibility property in Actor.cs is removed - NUIApplication class is changed to public class, hello-test.cs is sample app - FlexContainer's child property in View.cs gets some comments - nui second minor version up (form 1.0.0 to 1.0.1) - some useless files are removed Signed-off-by: dongsug.song Change-Id: I6e3392f98b8397ace49252e966fdfb8ec663b1ec --- .../NUISamples.TizenTV/NUISamples.TizenTV.csproj | 2 +- .../NUISamples.TizenTV.csproj.user | 6 - .../examples/AnimationSample-1.cs | 125 +++++++ .../NUISamples.TizenTV/examples/hello-test.cs | 77 +++-- .../NUISamples.TizenTV/examples/transition.cs | 4 +- .../DesignTimeResolveAssemblyReferencesInput.cache | Bin 40229 -> 0 bytes ...tedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs | 0 ...tedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs | 0 ...tedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs | 0 .../DesignTimeResolveAssemblyReferences.cache | Bin 888 -> 0 bytes .../DesignTimeResolveAssemblyReferencesInput.cache | Bin 12536 -> 0 bytes .../Debug/NUISamples.csproj.FileListAbsolute.txt | 13 - ...NUISamples.csprojResolveAssemblyReference.cache | Bin 32726 -> 0 bytes ...tedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs | 0 ...tedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs | 0 ...tedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs | 0 Tizen.NUI/Tizen.NUI.csproj.user | 6 - Tizen.NUI/src/internal/Application.cs | 374 ++++++++++----------- Tizen.NUI/src/public/Actor.cs | 8 - Tizen.NUI/src/public/Animation.cs | 22 +- Tizen.NUI/src/public/Button.cs | 41 ++- Tizen.NUI/src/public/FlexContainer.cs | 76 ++++- Tizen.NUI/src/public/FocusManager.cs | 19 +- Tizen.NUI/src/public/NUIApplication.cs | 89 ++++- Tizen.NUI/src/public/Popup.cs | 26 +- Tizen.NUI/src/public/Stage.cs | 40 +-- Tizen.NUI/src/public/Timer.cs | 5 +- Tizen.NUI/src/public/View.cs | 74 ++-- packaging/csapi-nui.spec | 2 +- 29 files changed, 628 insertions(+), 381 deletions(-) delete mode 100755 NUISamples/NUISamples.TizenTV/NUISamples.TizenTV.csproj.user create mode 100755 NUISamples/NUISamples.TizenTV/examples/AnimationSample-1.cs delete mode 100755 NUISamples/NUISamples.TizenTV/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache delete mode 100755 NUISamples/NUISamples.TizenTV/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs delete mode 100755 NUISamples/NUISamples.TizenTV/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs delete mode 100755 NUISamples/NUISamples.TizenTV/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs delete mode 100755 NUISamples/NUISamples/obj/Debug/DesignTimeResolveAssemblyReferences.cache delete mode 100755 NUISamples/NUISamples/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache delete mode 100755 NUISamples/NUISamples/obj/Debug/NUISamples.csproj.FileListAbsolute.txt delete mode 100755 NUISamples/NUISamples/obj/Debug/NUISamples.csprojResolveAssemblyReference.cache delete mode 100755 NUISamples/NUISamples/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs delete mode 100755 NUISamples/NUISamples/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs delete mode 100755 NUISamples/NUISamples/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs delete mode 100755 Tizen.NUI/Tizen.NUI.csproj.user diff --git a/NUISamples/NUISamples.TizenTV/NUISamples.TizenTV.csproj b/NUISamples/NUISamples.TizenTV/NUISamples.TizenTV.csproj index c415444..3f7e4a2 100755 --- a/NUISamples/NUISamples.TizenTV/NUISamples.TizenTV.csproj +++ b/NUISamples/NUISamples.TizenTV/NUISamples.TizenTV.csproj @@ -53,7 +53,7 @@ - + diff --git a/NUISamples/NUISamples.TizenTV/NUISamples.TizenTV.csproj.user b/NUISamples/NUISamples.TizenTV/NUISamples.TizenTV.csproj.user deleted file mode 100755 index e482657..0000000 --- a/NUISamples/NUISamples.TizenTV/NUISamples.TizenTV.csproj.user +++ /dev/null @@ -1,6 +0,0 @@ - - - - ShowAllFiles - - \ No newline at end of file diff --git a/NUISamples/NUISamples.TizenTV/examples/AnimationSample-1.cs b/NUISamples/NUISamples.TizenTV/examples/AnimationSample-1.cs new file mode 100755 index 0000000..1265240 --- /dev/null +++ b/NUISamples/NUISamples.TizenTV/examples/AnimationSample-1.cs @@ -0,0 +1,125 @@ +using System; +using Tizen.NUI; + +namespace Tizen.TV.NUI.Examples +{ + public class AnimationSample + { + private Application application; + private View view; + private Animation toAnimation1; + private Animation toAnimation2; + private Animation byAnimation; + private Animation pathAnimation; + private Animation betweenAnimation; + + private AnimationSample(Application application) + { + this.application = application; + this.application.Initialized += OnInitialize; + } + + static void Main(string[] args) //changed + { + AnimationSample animationSample = new AnimationSample(Application.NewApplication()); + animationSample.MainLoop(); + } + + private void MainLoop() + { + application.MainLoop(); + } + + private void OnInitialize(object source, EventArgs e) + { + view = new View(); + view.Size = new Size(200, 200, 0); + view.Position = new Position(0, 0, 0); + view.AnchorPoint = AnchorPoint.TopLeft; + view.BackgroundColor = Color.Red; + + Stage.Instance.GetDefaultLayer().Add(view); + + toAnimation1 = new Animation(1000); + toAnimation1.Looping = true; + toAnimation1.DefaultAlphaFunction = new AlphaFunction(new Vector2(0.21f, 2), new Vector2(0.14f, 1)); + + toAnimation2 = new Animation(1000); + toAnimation2.Looping = true; + + byAnimation = new Animation(1000); + byAnimation.AnimateBy(view, "PositionX", 100.0f); + byAnimation.AnimateBy(view, "PositionY", 100.0f); + + Path path = new Path(); + path.AddPoint(new Position(100, 100, 0)); + path.AddPoint(new Position(600, 600, 0)); //added + path.AddPoint(new Position(1100, 100, 0)); //changed + path.GenerateControlPoints(0.5f); //added + pathAnimation = new Animation(1000); + pathAnimation.AnimatePath(view, path, new Vector3(0, 0, 0)); + + KeyFrames keyFrames = new KeyFrames(); + keyFrames.Add(0.0f, new Vector3(10.0f, 10.0f, 10.0f)); + keyFrames.Add(0.7f, new Vector3(200.0f, 200.0f, 200.0f)); + keyFrames.Add(1.0f, new Vector3(100.0f, 100.0f, 100.0f)); + betweenAnimation = new Animation(1000); + betweenAnimation.AnimateBetween(view, "Position", keyFrames); //activated + + view.KeyEvent += OnKeyPressed; + view.Focusable = true; + view.SetKeyInputFocus(); + } + + private void AllStop() + { + toAnimation1.Stop(); + toAnimation2.Stop(); + byAnimation.Stop(); + pathAnimation.Stop(); + betweenAnimation.Stop(); + } + + private bool OnKeyPressed(object source, View.KeyEventArgs e) + { + if (e.Key.State == Key.StateType.Down) + { + if (e.Key.KeyPressedName == "Right") + { + AllStop(); + + toAnimation1.Clear(); + + toAnimation1.AnimateTo(view, "PositionX", view.PositionX + 100.0f); + toAnimation1.AnimateTo(view, "PositionY", view.PositionY + 100.0f); + toAnimation1.AnimateTo(view, "ColorAlpha", 0.5f); + toAnimation1.AnimateTo(view, "PositionX", view.PositionX + 200.0f, 1000, 2000); + toAnimation1.AnimateTo(view, "ColorAlpha", 1.0f, 1500, 2000); + + toAnimation2.AnimateTo(view, "Scale", new Size(1.2f, 1.2f, 1.0f)); + toAnimation2.AnimateTo(view, "Scale", new Size(0.7f, 0.7f, 1.0f), 1200, 2200); + + toAnimation1.Play(); + toAnimation2.Play(); + } + else if (e.Key.KeyPressedName == "Left") + { + AllStop(); + byAnimation.Play(); + } + else if (e.Key.KeyPressedName == "Up") + { + AllStop(); + pathAnimation.Play(); + } + else if (e.Key.KeyPressedName == "Down") + { + AllStop(); + betweenAnimation.Play(); + } + } + + return true; + } + } +} diff --git a/NUISamples/NUISamples.TizenTV/examples/hello-test.cs b/NUISamples/NUISamples.TizenTV/examples/hello-test.cs index 25695cd..c78ba14 100755 --- a/NUISamples/NUISamples.TizenTV/examples/hello-test.cs +++ b/NUISamples/NUISamples.TizenTV/examples/hello-test.cs @@ -24,8 +24,8 @@ namespace HelloTestExample { private void LOG(string _str) { - Tizen.Log.Debug("NUI", _str); - //Console.WriteLine("[NUI]" + _str); + Tizen.Log.Debug("NUI-APP", _str); + //Console.WriteLine("[NUI-APP]" + _str); } private Animation _animation; @@ -40,7 +40,7 @@ namespace HelloTestExample { } - public Example(string stylesheet, Application.WindowMode windowMode) : base(stylesheet, windowMode) + public Example(string stylesheet, WindowMode windowMode) : base(stylesheet, windowMode) { } @@ -49,6 +49,7 @@ namespace HelloTestExample LOG("Customized Application Initialize event handler"); _stage = Stage.Instance; _stage.Touch += OnStageTouched; + _stage.Key += OnStageKeyEvent; // Add a _text label to the stage _text = new TextLabel("Hello NUI World"); @@ -58,6 +59,45 @@ namespace HelloTestExample _text.PointSize = 32.0f; _text.TextColor = Color.Magenta; _stage.GetDefaultLayer().Add(_text); + + _animation = new Animation + { + Duration = 2000 + }; + + LOG("[1]_text PositionX =" + _text.PositionX + " SizeHeight=" + _text.SizeHeight); + + _animation.AnimateTo(_text, "PositionX", _text.PositionX + 200.0f); + _animation.AnimateTo(_text, "SizeHeight", _text.SizeHeight + 200.0f); + + LOG("[2]_text PositionX =" + _text.PositionX + " SizeHeight=" + _text.SizeHeight); + + _animation.AnimateTo(_text, "Orientation", new Rotation(new Radian(new Degree(180.0f)), Vector3.XAxis), 0, 500); + _animation.AnimateTo(_text, "Orientation", new Rotation(new Radian(new Degree(0.0f)), Vector3.XAxis), 500, 1000); + _animation.EndAction = Animation.EndActions.Discard; + } + + public void OnStageKeyEvent(object sender, Stage.KeyEventArgs e) + { + if (e.Key.State == Key.StateType.Down) + { + if (e.Key.KeyPressedName == "Up") + { + if (_animation) + { + _animation.Finished += AnimationFinished; + LOG("AnimationFinished added!"); + } + } + else if (e.Key.KeyPressedName == "Down") + { + if (_animation) + { + _animation.Finished -= AnimationFinished; + LOG("AnimationFinished removed!"); + } + } + } } // Callback for _animation finished signal handling @@ -69,7 +109,6 @@ namespace HelloTestExample LOG("Duration= " + _animation.Duration); LOG("EndAction= " + _animation.EndAction); } - LOG("[4]_text PositionX =" + _text.PositionX + " SizeHeight=" + _text.SizeHeight); } @@ -80,41 +119,11 @@ namespace HelloTestExample if (e.Touch.GetState(0) == PointStateType.Down) { LOG("Customized Stage Touch event handler"); - // Create a new _animation - if (_animation) - { - //_animation.Stop(Dali.Constants.Animation.EndAction.Stop); - _animation.Reset(); - } - - _animation = new Animation - { - Duration = 2000 - }; - - LOG("[1]_text PositionX =" + _text.PositionX + " SizeHeight=" + _text.SizeHeight); - _animation.AnimateTo(_text, "PositionX", _text.PositionX + 200.0f); - _animation.AnimateTo(_text, "SizeHeight", _text.SizeHeight + 200.0f); - - LOG("[2]_text PositionX =" + _text.PositionX + " SizeHeight=" + _text.SizeHeight); - - _animation.AnimateTo(_text, "Orientation", new Rotation(new Radian(new Degree(180.0f)), Vector3.XAxis), 0, 500); - _animation.AnimateTo(_text, "Orientation", new Rotation(new Radian(new Degree(0.0f)), Vector3.XAxis), 500, 1000); - - //_animation.AnimateBy(_text, "ScaleX", 3.0f, 1000, 1500); - //_animation.AnimateBy(_text, "ScaleY", 4.0f, 1250, 2000); - _animation.EndAction = Animation.EndActions.Discard; - - // Connect the signal callback for animaiton finished signal - _animation.Finished += AnimationFinished; - - // Play the _animation _animation.Play(); LOG("[3]_text PositionX =" + _text.PositionX + " SizeHeight=" + _text.SizeHeight); - } } diff --git a/NUISamples/NUISamples.TizenTV/examples/transition.cs b/NUISamples/NUISamples.TizenTV/examples/transition.cs index b732d72..882b21a 100755 --- a/NUISamples/NUISamples.TizenTV/examples/transition.cs +++ b/NUISamples/NUISamples.TizenTV/examples/transition.cs @@ -124,13 +124,13 @@ namespace MyCSharpExample ImageVisualMap _imageViewMap = new ImageVisualMap(); _imageViewMap.URL = "/home/owner/apps_rw/NUISamples.TizenTV/res/images/gallery-" + myCount + ".jpg"; - _imageViewMap.FittingMode = FittingModeType.SHRINK_TO_FIT; + _imageViewMap.FittingMode = FittingModeType.ShrinkToFit; _imageViewMap.DepthIndex = 0; TextVisualMap _textVisualMap = new TextVisualMap(); _textVisualMap.Text = "TEXT-" + myCount; _textVisualMap.PointSize = 20.0f; //20 + 2 * myCount; - _textVisualMap.TextColor = new Vector4(1.0f, 1.0f, 1.0f, 1.0f); + _textVisualMap.TextColor = new Color(1.0f, 1.0f, 1.0f, 1.0f); _textVisualMap.DepthIndex = 1; myContentView.ImageVisual = _imageViewMap; diff --git a/NUISamples/NUISamples.TizenTV/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/NUISamples/NUISamples.TizenTV/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache deleted file mode 100755 index c1373826e73726a238a70b19641604d2b81ca770..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 40229 zcmeI534B!5+5b5Z0{4Oh5D;<0eS>MjF55dv|N+#~~&nK&~60^+XKVzsr_ z_0_7iYFoEgtF5iIwy(CfwYIfYTdTgdTI*J|wp#1P`~04n=ge~^Ghqh8=kMqLVf;9m z=b7L6KIhzf?!9LndYN9mdTpf_{^B*TH@!8@k2EIY$#`=rv^0|J2uEvD9ZivVXlA^v zEgqXYYxbDYOM^r*5|15IH6c`q|Hh1-*%3{3B!XjNK}RYPj*c0W2qn!Z(o)Ox3>q0(Bg1nZmhi{ zmE4mO?-`CpB(f!))4KSy&)CEkgMcwq@Ed%HAh;iBhg?)V>s3nX$q$TQNo+t ztGOc@txkm7g7xvlTKTFr+(6$AbH1yNN1Ld;`@&fpPP7Cmo2;gzAsM6=5F~j}q$L(l z1hazXFdd4yv1E$!m(5)od_?!6G%hXOBa$DnPZz&VH9AV=Or~%+gI?hUK zQi({cWz6WdWMe!LjWlGhvEnbW$&!e~Zo!hdHQ}~)YTT=jq1wpCAXdAyF5a-FZdTCH z(L(P@YNOXuJ92T5j7QhmPD8fQ7-|eRwgz4W@;;c}hDr9MSA=YOC|mhZdMkrjzB@j( zB_mP(!W&Me@kY@55F9o9U%m(4LhB>3wx;rt^tmk56pfant5X&VHUvX(VAnx2iryCO zNO2Q%6e4Zm7WxxTB;xBs?Xi~fy@*=dL(~@ZeG;8xD?@AATgvy|3FIm!@3Rxg4~vTkv0Y&Lf}(+65JYTX^qnVDaIe#)A??TH!=7y05MwCDlAex{&i+_JFX$0;vON+@ zGebMdOrdEowk;fsG}C}uXhU1H{By)ywIlgNt0ZWu!|BXdHR&N-Ng-CuoLaXeNh6MR zZ(eZY8<$@F=6ToEg<>5v)K=FXZd}Wc?b*?`8gAlLg{nf8V;h20cx+|mQFSzOR2K_U zbos}cs1{a*#@C6ITN72p4;R6=ZLiSGbR3LARZ-5HU3_J>m6lO*m~j*)T2h$wNb`(v zGSXOAg)!wk!Kzd+rRRv_DPl)S5tl_`ucGFr;m{K(bYl^r zGd+swJUE>SHl!#boxH9Gby8gyDF>QJfmRhCXhugfjdP~URoS&>R7sSKjzdhM5T_R( zLXUychfEkap}B2s z9Vtu})K!JX(Mjxb;Z^1ualO`4F+ zM4_adlc|)GwcDGK^l|Tcw$%}Eg5$^^O#w@&%2c$EE z5~c~9WGd2_45hn*T#LJ_PF<34++!&2=Sw)N4#j4oCf<=~lmd6DT(-d7CFa~5OSviL zzL>e=XkKQvWt(*?PZ|z=9ECn@`%XY@JRU80L$>uw2j&zU_W12Dacv^pNV717N<2}n zCMR$@4Tqjip<^YKxHA@RqgkWO#8vt_>bAnU2{`5qin+P?m?uQz4KyaQk?$L!nc--F zhC;z(Z7W)Vbex5ml!Z0hnT2f^+Kr5x$1I9>=61#lWv7YLp}XF<3Y0mUkPAJVGEu@U zbM8XSXSY++4^z~IYM2e}$~j;)1>978sdES`BJG&7-Da8dC*us9KpChhB?E;@X|E#+ zhVwaxz>!kGArvKj$10{kSv7~7OW{hWK9orXD5kxbxtA77$eB2iGEqX)!(}ZCr)UH+ z!Da96ahNw1hd+tJuP^D4&kx$-iO%_0h|z@OA??a8T>@Q)yCmY^^GZGeOJdX!qmEBg z8c4GzLAb4$Q=c~>XJS5OVp;J=U|uA4TA})E+v^Z9d;!7ZrNQaOBzFfK+U`3B97rYL zpbIHz36~Kw7KLfCPBe%XI+nJR;HWv=A_`Z+4UhpRchIOXx0(xdw(PUrm2<$8DPVo^ z2X#S^3e8ES+6x^_TTeyEK^9YxWNAULZe=kh3p&si=OfwOMTu~35)NELfs5%fXKpT_ zu~IU$lm3Wo>p!OgaO30a5Ntq~Nm?z7k^5(5lwi%R_a-cd2R6^50 zrOq}{3)LrkPV=VX@T(|%2|Y#ynopyUG=LnYA(8Rhk5efhC0x&V_F%9e8CuMD6+ZXfjY#Dt;Gp4> z3!jae{xqMPXz5mIo~uk%y#gsY9}Sd`5=Mryedlc)@$}+Q4$(*U; z9JG~!URuK8u??M>iO%*^yoJ`rw|0i6M_XupcdE4w=L!STT@H%vrECkpxr$J(w(M}O zX2%-iP3aLen$zi;CtG#%=Sh-tj@I*ABkkdWeM5Ug@0x@Iw^85{h6QVb z4XKcv@${wC-ObLCbG#VEJFA3K;S#d9>QZB8Q*t)ql#LSZxSR`G{MHc-CsdEVPz|tG zae;K4g?7q9L-Eg<+EyA)v6pF8w?|#19OpEOQ$oAk#tGGilWS?3h1!bEw1AvXaB#Zt%(+fm6wY1$&1VoIODk7|UnH8)=L| z76NQ5q?L2LjTEn#SwmjB8=}P&w97C(2_BjeZfe1Nd}U}{*9&TVU7-{lb`ymyX2hr~ zgaYDO-Q^0-8xS{-(Czp^K@tIiab_ zqMN#{LuVt1NTjK$KM5IJ5qb)stu4toxT zExz6hWLcy-!U4w@E}zzNsBFAdK-UblG=)B9p^jb2FjV&;Z2hcKOx?{Ks|mg97D2hYrah@8uFQAy>&IuCjv z;z`j>1x~9N{{_OYEc$FLiEIefq*Bc9=E0DWaeyr)2dJgF3KU=)0Z7IHE~WrC71KFd z9&QU$&o5L>gDlCqaWs-UK2$Y1eeJZz6TIeaENxObG8UvJOgwUZ`;^Kf$(&L}AH(!c zTfO7cV@-*8q^YX%NTEd*){wO!&29@fj;pMbuQ(9h$Pxi(^ox|yTRy`XT|`TwF#yGx zy@WD*LCKj7Sq9ht>_L`wym{^#lX8xii{Q*$`WZjPbi%pqT-KK|x@!yQt}UQF`eO$@ zy@R?BRnqc$>NvF}`_dkrjY0qVb?IL{p>OUg%RGd#Gq~9wf!Os65BR;8fWs6xqWNI88n^ndx6>1|r~jpFQ9kvzLb>W1_a)MfOcteSqL#`LF8 zxXC&(jhD|m#3wIaLk7?rvQ>ULy^Y*7Gw-kFY%c#QeLHm1oJcH%-$}s_s9>M*=JG4Z zKWbBL{-1>D++2PoeZOP7e6J$HZkrZ|*JJq^R?uuNznWatJ96~0-Hag>#NtzO4RX38 z&>_Q#fLGZFdfT;?yp-RCTD7W-j#68-1U#=0813-6}yu1VTB-KYPE z%)NMFg2u4JQJdtR?)LC&%&uMh{F7X(R;^rhDjj_9T6%jFAO4Hp`tf}W7Y1H^?%4I@ z+tx3g?RxUrU!Yo5hPqVX0!5t~P@n!qw3*>#(94*9sBwH3K9&CVxqH_YT+)x~(ap1w ze$8*!VJq#o2-81b(r0bZ*>@d&n$46QpWXlJ`~+gbA12KG-Id-{eao+>xBjyI*83V+ z=2SX8I7Q_*k~KIRCB4hmy9t_AqPdx@;aQE^^6Gs9!WAOCm8?-&VeT$f?>4BHiTYb) z4aqz+vzt-9Z$nfoqC3bMlo4e%hDvNP>IG8rn61 z_Z_HC64m`=?cG(C-EirB7y3D(e}Jt0t=`#as5VG?-$$a^lITIQhUZP>{Sd+#BK#3q zau}#!*o5dk48?Jx_z77fGbp_;jQ0?F{{!tb(c+!}6u@{s7&fqI;IC{qpJ5oVxcXBsoZuJWrOKY}yf{wqbcM zK)AmMUnEOvv?~l{woiF~MuL4M!AoR$nas>x=)H_D_mVGPAxlc+Y{c>Y2Hi-}y+)Rl z$kD0w{od9Ag>VlyJV>x<=sQ$ z{S!$BN|N`;8jy*AtsCC^_}Y`NKOk!l^|jvY;{6BGa*=*SmK-)`(~0*nbbUnkDOqw> z-OVE2RtWLCwtS~G)Xu2L#HKkZ-V@^WCa3x2(~P8ytUZ;)-Jap$w`$FYBJM|)1O_j= zAk6Cz;lD-bleN2|%615E0A&9X*={*9nTzrULG}-k4JJ$Oo(P-SgWwH;>Mc?2PL^DF zQ03V&;0;5HHzdUfvgFj*b%~js0p1>vzADl^$&xInCHmedsQxOdy~&c=qgF^eEAhR3 zkmN6tWIwXxiIh#^jfUudMRWjJQt7iIec2xf{d1x}m@K(#D!nXH_YQ&jkD@*-KV6;N z!=Zm#^hc64I&*Rr-CfP?jX|2bb1+&8}Yara=5N5lWE9JbkNOHL(X(LN&uZqLP@nVpES)}b`$>Td$iUn!jX^>wc@+4V#%8GSoUJA-B zqFhIoTJx8=>k~Ore);kNT zGeva{S)-m21*jFAn|U* z_p9amudDBQC5Lx2zF#Td-$K^#OnP^vhj%N4%SHIjEGWJ9!uuA!Un1Y%PS$Q|P-g9f zcLxNEMR1oZptTR)-4HAk!98RR?Yi*5yBDf?qPmZ)5w1$6+r9gtoGZ%jk+pYzWr#EC zJpg^R=zl;~PJGOYdk>PoF9ryDWZ+@XX_y7V^vtnq>+5IGZ-&wOx9Ug`ZQ5s={CX;y zxVhh&K60;CEgGEwqZ(c%-X21+Fj|33dsTRQ7%q%UuxlJ#KY(VigX?Ly&=Y6ZF>w6>E_Aoqbu3)Z!i8QnyN-kFIk?buX4mm> zy#N>b$n2U9*NbqW6U?p|aQy`?^mo}c6RwxxLVuQBv*3CKF7#a4H5;y1;rg?s`3eM`YJYaQzD|^a0s553cv& zLcfn)^WpjcF7)r%wE(UU;X+rAT?^s*7_P12S_IdpaP_7)R-Fu2FRFb8T`_hohO0MR z{l!%SR~cOBV6mzeu5!2riE9a5{oz8-iB(JC^5GgLu4QoHUqdnI0Rgw4Pbj3ReiO6U7yQs}e4>cUiRtu5oZJ64zR|CcuSuDyyP!O@eEwxZ2>F z0vDQ`tct-k6|OpQ#o?L;7n+c)YKQAsxEjQD8eGT2g|;B85^&9ct5sY{xMsnHmK>{6 za8<(<6ITaZbKpX&j8*I4IuWjvxYolp4=yybShWGJ1#oQ?S0`MH;6lTRRU6@24A)uW z+5}fETxbfh>U6l4!gYbTHp8_XF0^)7bp~83;JR2`XTntn7uqqbIt#AVa9t*@v*9`w zF0@Tpbq-t&a9t&?bKz=&3r!GKod;JlT-S^1e7IWSLaTyR7r?a!E;JxAK zfomgNcwV#XQn*ehSJ^}4+Q#E^Ac_0d3VDe_dLArhru z*C?;Aj)q&36%5LzH~sqc>fMK5{d)KAF9QpiTujV#(I^=GGfN$b^v{W9+6wf~427iG z;AD3DQpt$9YLs*-+O%TxlgYnx1o8xs?BnS1;py#NPiN2f&Y*LBCVx5;XZ@^Cwr<_N zQc-p3)sLr}>g#*;Cxf~?1OpI;Uv>t4+M!~(5nz>VCT20Eb(3;_4BB_7&Zf405$9A19FjOqJhZFo0)mBWquLN1nJ~>nA4Qun|87+Gfqa9 zi54a^Z)N6JEc0?O*D8!zqYU3fG_%!V{#2OXV&*lLc`cYt3S%0T;hP4{3_DD;aXFuN zF!M&sya~)z3S;V&;hUA3xx!(hk<84ynR%OKeiO{43S*Wi!#A~>S>rGt7v{apyvs80 z26Lgpm<7u4&3w(A=P=Ps=X~DJ%=<0#yI{^y7;}O$d{eENvmGYd`OJKPnLo75hrpb! zFy?q=_~tmxJl0{Nqrl7unfZuiJ__bkg)v7d!#7hjbF#xkPlK61V&*R`^Kmf8D~uVZ z4Bu2~W~IYKSB05BVdj&T`8zPjD2zE$8NN9}GY@x|=<6`^QD*+pGM@$WV1+RUDZ@7h zYUTkB6P+byKE})!E%VP{?yE3nA7%JvZ_V7xVWPLi%wIC|Z?Y36PY6a78T=Wm($o@Krdrl&BbzcPH&PczFMCOVAF z{5>;2w#-k!?5!}yD8o0sG;{06`u>R?Co`X6W}iOtz$>Fq<|ESDd-8|M@Xde7viIZ< z9Of&+e3qHMWex!IUkYRXsSMw|tC|0BnCSCzKA&eM{vDO{gLx>Je^(gurZRlT=ccl6w9HLlo~JP8TxIy?9L+r2 zVfGj1Zp=K}GS2~Xv%;9umEoIBnz_+oVi1kb(O_m?Xqgv*xlUnBhcbMV(#)j894O4) znR%&YehJLD!kCyceAA|xQHME5m?M~Zg=Jm|W~;)O7G?ORSu+ENIaru`GV?miydKQ3 z!kAN);hTERTpGbcFAeT5lf z<`b6rYcMMn#(Yj0z6ojOScf@Um{rVt$}*n@^KgYRhbhB1hic{_4)XwEPGIJ9miauG z2Pll$Um3m`t(p5d%!7nEnVBzH=F4F2r7&icGJLbAW{z~2hX`{jGhesNH^3aGFlKjU z_-3eP4sn==3G*0c{=+ig1#>rrF$0z1n*o~XJ4_6!bDck)nIBl@f50qP7}Hl7zA4kp zJ`Qt?FlRDzt7Y~oBj(nRRD1qYW%%Y3vTS?)V=}U1EFoc5GqapX>9%)2Fh5Wj^KWJN z=6%h4&tX;yb1pM?v&=zY{zGBRJIe6Q+nV{7!yG5fdCVMUnZv<+U17{?%J9vrn)x?} zIYF2UnYou`?hWQk3S<7F4Bz}&GhcL=lZ3gLnFmFn@XfQD`A3I|xe=~Q zOPG1MWgY?MQwn2#uMFS(PBWi$m{WzhoSBuDSq0`33S)ky4BtGinZIE|p5ZVT3-felo@bfogSk;* zOs6t@vq3Z0JIq>PV)>WvZL!RY!AvTQNhrfNr)g%p!(1xNbC`LVWqt+BsKS`F%J9t^ z&5Srq%$0Io!jdxIyV^3Z0W(k-)1(aFG-_sp!(1WE3z>O?W!?zpYK1YYl;N8?&0Og) z>x7AQYrc1@W!?tnGKDcqmEoHunpx{GR}1qJX5ML;cY(P`Va!5h_-27-&Ucun3KMJM zeD6NXydTWD3S;Id!#5{rX0^j?5a#8~e9$s~2<8lhG1Hado8vX}IL$0;BIf^h6S?V` zTukI{-)!afrOGqa`2S+&7E305pZ0@n^?h@Ust0D8GJJEit`t*sr7+D>(XQc&_L!|` zKSxEIq%dZpGJG>ZGsip3R$*dIrtkgQGJgZ+=M=_-l;NAPnmNW{V$}rSv~FPL)0X)R zn1?BhIaC?GIYcuLc9>CNVxgz+J#U#WfVscIn9<7c&3>A>ufvQ9^A={lY?*%rbCklE zJ(b~`k(#-O!)zBO){*+&8C8LAB54AIQN4l^Ol+nM>UW&RV)feK>=D8o0t zW_k`YB}^<=^}YXC=7(VRRTxvI4Bzz8%-#-joiOiVCVu@R-61pd$$a{u>g0W*4BvcA zmhI$yL`Jrghs7^km#`kz_xf38e=z^8Fy?(__~t#${FlSrD9rCMbC6|LfccKXn75VT zo3}Lc?+){HVPbWy?+v%i5n#TiFy>Wd_~vh#`HE&%oIy-1%IH01(wosIf4=XQGA#GV zSp-9;t5C0wG5I0ks(P1mL@Ru@lCsL z{ngm#Pc}CxDJ1f$xJ{(CSXg-=RLCUH6SG&~rl@v5vtdF}$F&iyZNF~1&m|S+Lm}J&cOU0bA zE5+QgmRc&Nf?4|Ajde@+obcjB22;W!6&W&8ff-&`ikV)KI(fy!t(yT%;EL3tVm{WD zVqR9H4i(d^t`yU)d8L>=b)}d^)l!i0s=%bEE5+n!UMc1}T`A@~wN#2$fhkN^im6PI zii|UWnMqfQ8Opp;OgOqyOgxH|%aeJlz&xTW#e8C3DW(TqDW(ZU>f{x(ey$X=eznO9!#X53b_K)TCNn+TOtL`9s$f&xl+tpX{n`R63UfgGD@T(1HA%sORf}iOd^Fu zUKN-!a;2C$f)qshXkQhW338>F5z0%&1dl7lM2|?Fykg$Qm16!zq&7NzsK9iLE5)=- zUMXf-Tq$N-MCxP!lP9helPGzmm=kfOm>UtPlUGc2xKd1ch}6jdW-weSW->(TP%$y# zN-;r^SBm)tSBiNDk<$6KuL?{fxKd0fh}7!nLj`6BTq$M=@=7u2?@BTFFH+|SU@YI2 zVoYD8P6jYU?@BRLuch|d!pOTT#Rz;}DF)PCDF)U>>f{yU?Mg8W zF4A&Ut_qB5yHbp9i`1cFu$rZ|rHMgnEfsJD#-Lp)#-j5|F|_PTF~po#iV5|^=9OYJmZc}&H21YX9klvFgHc&X^+`o0 zDlo|EN-@})SBkMymJYmg|CZ;fzBAWg3^lJ5L!vBwF8-ZEzx3}-3k-%v^GY$&$2^=EoL~ diff --git a/NUISamples/NUISamples.TizenTV/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs b/NUISamples/NUISamples.TizenTV/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs deleted file mode 100755 index e69de29..0000000 diff --git a/NUISamples/NUISamples.TizenTV/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs b/NUISamples/NUISamples.TizenTV/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs deleted file mode 100755 index e69de29..0000000 diff --git a/NUISamples/NUISamples.TizenTV/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs b/NUISamples/NUISamples.TizenTV/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs deleted file mode 100755 index e69de29..0000000 diff --git a/NUISamples/NUISamples/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/NUISamples/NUISamples/obj/Debug/DesignTimeResolveAssemblyReferences.cache deleted file mode 100755 index 6118a7395aa67d3ff9ea2599b275c599d436b086..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 888 zcmchVQE$^Q5XaNB$=WnS{Qx`!i3iZCD5WcGNEL#JY7^U3Xtk#Z$xSZ9suK^}85F^X zgwKKa3UHUT(}0Rc9O-$BtI*g@) zesB&-b6JiD`(Z>+KZq+~Dh1;bDx;X_2h(aHc=`%fbGd|ayoiSRD1VX<2H7ZLL*`Ji zd)sTwR@y)@Gt2-*b#gACJ~i)NU!e*iAT=mKheu4mGi)J%RCk(aT4eqix`P4UiDcP? zrADfqbwBM`7MDzc>QT~IW-wLqif5qO^kT+8K?^(5?l}_`Xv=CgEywA$x79k{rW}!LT%;){WB%5Xzh~?bZaJrv}z$bp?DCSDG zpD5ODbLCc;Do5=k)^DKk8!QOq7WWsl=3yh~EN;g$Mi`gSu3f+fX5z9rR0?^ca9aPRuQdrLC#G2XYRvc^=4$Ngs2q@j7df=={1q7_NS zOT5V-igKi5;M+sj?fCt}AL@43ee`v4a2IcWrGBtgHo!P_JOr~O6!&7O1lL#Fe#}&r zGv%$XvUpuzZ4FgiZY$Y@glJUP6mJO~tIl47F$^r`B*I(hXiyjfTy6~AT9%R6;Ogyz zt4l(+1J)si!wpkIyWMTLs-(xYmTCd$MT{}Q(GS8K%LoO8}Q&dA7l&~uqg#=#eK1%tVjFiu$wZI66P&Hg&`k=*&Qm!-mcb^r&8( zYZ>x`$IgRX8XKkJ1tM?x88lcQR1iMa0Rb*9?& zsk+YsQI8T)U-_(DWnmk>>tInfzNnXYBWZzZxSln*M-{GRu-W&8_k1DOW8OL+`v#af zS3z?7u=PBCgE1ZA{J>Dh(c(I_$o7Vl?Rs3!HQX7cX3jUM6lxJT*HIc7`xenl<0NMK zIyZ>8TOta5=XI1vT|Wq%o2JCK`8a7}nw}x|zxclhq|Lky*5carOnBhjLPsx(_v#o( z3!y;PLSMN(Eo2mrf^ML01F~B|@)@h*B9hpGy7p73}`E_PUx54&rnZpOr zgIa&eLI&T^U6Lx)?vy)?Pky#ghm%-ur>64(gf?*>ZCgfuPzxjV4U8o^2VBZ4R zjui{+FFJ0qO3Q~~{~fSDfeDZW+Z`*TJ|GgKMdfV(_=Q~nVOvH#ikGF&yQ=>#F#IWV zf*=+*f#*Kcv`f*6JYx{w1E|<8rgWWo2b_OnRU9S3uxF!V;b}zk5%#UTSQ{yPA6R~U zVpz;8+u-=YiQ=e98Fc0GL*S4$t%Bz0yI}fDn@mfch=th2NjH*=2HpdRU7H{t1hN6I z?j@t0B?IAoKu|Uzlph(s6X0ugDR?NN7lv~VoPT9?`We=X+iivIMYE$v2KWJBSba$t z6rUzsbtoP%qHuvh+f@Dvj}7A=f$?vx>VP=oOHocaB5!VQ3QXG81YucKA{4RMM7TiK zkOzjJ+tx&dzeup3-$gJ51XjJKM-AE;-}6`~_J6i!gwUTK*{h^&>7%`EV2S+$ey(T`z12j*Ye6-LT^$U^P{ z$X`wbNP28qtGMd#my69{U>88(klA5g@F-n$vfWvCbthw;Ig!R;mYJylvAVA;$f1_9Jk& zyF3y53QUiyCs;01udEChb~m*M#{O3<1yUaaht*}0U_32JFA1^VX$M z$tWEwo*jmt9flui+SgI%l9;pE=U7HUec`zlFZspio8A0R-1+C|0VgcIbhxuzH_Ckd z+O)jmu=}G{{t;*XJX^bXaqJ;hz1}rWNfnd}>@0(DEAQxW%Hc3PS5O#TLSAo%@;OYB z#~`>2C3t+LcAPRk=o+W255n)Pg52CG9++sn>wJp4*LFSchkH4-U>KX^1GzC>f_j5hKLMC|FXQ f$ru5|KEBf8Ni diff --git a/NUISamples/NUISamples/obj/Debug/NUISamples.csproj.FileListAbsolute.txt b/NUISamples/NUISamples/obj/Debug/NUISamples.csproj.FileListAbsolute.txt deleted file mode 100755 index b1c886c..0000000 --- a/NUISamples/NUISamples/obj/Debug/NUISamples.csproj.FileListAbsolute.txt +++ /dev/null @@ -1,13 +0,0 @@ -D:\ssong2best\work\2017\workspace\csharp-0217\Tizen.NUI\NUISamples\NUISamples\bin\Debug\NUISamples.dll -D:\ssong2best\work\2017\workspace\csharp-0217\Tizen.NUI\NUISamples\NUISamples\bin\Debug\NUISamples.pdb -D:\ssong2best\work\2017\workspace\csharp-0217\Tizen.NUI\NUISamples\NUISamples\bin\Debug\Xamarin.Forms.Core.dll -D:\ssong2best\work\2017\workspace\csharp-0217\Tizen.NUI\NUISamples\NUISamples\bin\Debug\Xamarin.Forms.Platform.dll -D:\ssong2best\work\2017\workspace\csharp-0217\Tizen.NUI\NUISamples\NUISamples\bin\Debug\Xamarin.Forms.Xaml.dll -D:\ssong2best\work\2017\workspace\csharp-0217\Tizen.NUI\NUISamples\NUISamples\bin\Debug\Xamarin.Forms.Core.pdb -D:\ssong2best\work\2017\workspace\csharp-0217\Tizen.NUI\NUISamples\NUISamples\bin\Debug\Xamarin.Forms.Core.xml -D:\ssong2best\work\2017\workspace\csharp-0217\Tizen.NUI\NUISamples\NUISamples\bin\Debug\Xamarin.Forms.Platform.pdb -D:\ssong2best\work\2017\workspace\csharp-0217\Tizen.NUI\NUISamples\NUISamples\bin\Debug\Xamarin.Forms.Xaml.pdb -D:\ssong2best\work\2017\workspace\csharp-0217\Tizen.NUI\NUISamples\NUISamples\bin\Debug\Xamarin.Forms.Xaml.xml -D:\ssong2best\work\2017\workspace\csharp-0217\Tizen.NUI\NUISamples\NUISamples\obj\Debug\NUISamples.csprojResolveAssemblyReference.cache -D:\ssong2best\work\2017\workspace\csharp-0217\Tizen.NUI\NUISamples\NUISamples\obj\Debug\NUISamples.dll -D:\ssong2best\work\2017\workspace\csharp-0217\Tizen.NUI\NUISamples\NUISamples\obj\Debug\NUISamples.pdb diff --git a/NUISamples/NUISamples/obj/Debug/NUISamples.csprojResolveAssemblyReference.cache b/NUISamples/NUISamples/obj/Debug/NUISamples.csprojResolveAssemblyReference.cache deleted file mode 100755 index 5fdfd739dd5f071b4e45dc3899e9c25a19adc28d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32726 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 diff --git a/NUISamples/NUISamples/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs b/NUISamples/NUISamples/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs deleted file mode 100755 index e69de29..0000000 diff --git a/NUISamples/NUISamples/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs b/NUISamples/NUISamples/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs deleted file mode 100755 index e69de29..0000000 diff --git a/NUISamples/NUISamples/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs b/NUISamples/NUISamples/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs deleted file mode 100755 index e69de29..0000000 diff --git a/Tizen.NUI/Tizen.NUI.csproj.user b/Tizen.NUI/Tizen.NUI.csproj.user deleted file mode 100755 index e482657..0000000 --- a/Tizen.NUI/Tizen.NUI.csproj.user +++ /dev/null @@ -1,6 +0,0 @@ - - - - ShowAllFiles - - \ No newline at end of file diff --git a/Tizen.NUI/src/internal/Application.cs b/Tizen.NUI/src/internal/Application.cs index c52adaf..c616ded 100755 --- a/Tizen.NUI/src/internal/Application.cs +++ b/Tizen.NUI/src/internal/Application.cs @@ -1,19 +1,19 @@ -//------------------------------------------------------------------------------ -// -// -// This file was automatically generated by SWIG (http://www.swig.org). -// Version 3.0.9 -// -// Do not make changes to this file unless you know what you are doing--modify -// the SWIG interface file instead. -//------------------------------------------------------------------------------ - +//------------------------------------------------------------------------------ +// +// +// This file was automatically generated by SWIG (http://www.swig.org). +// Version 3.0.9 +// +// Do not make changes to this file unless you know what you are doing--modify +// the SWIG interface file instead. +//------------------------------------------------------------------------------ + namespace Tizen.NUI -{ - - using System; - using System.Runtime.InteropServices; - +{ + + using System; + using System.Runtime.InteropServices; + internal class LOG { internal LOG(string _str) @@ -22,17 +22,17 @@ namespace Tizen.NUI } } - /** - * @brief Event arguments that passed via NUIApplicationInit signal - * - */ - public class NUIApplicationInitEventArgs : EventArgs + /** + * @brief Event arguments that passed via NUIApplicationInit signal + * + */ + internal class NUIApplicationInitEventArgs : EventArgs { private Application _application; - /** - * @brief Application - is the application that is being initialized - * + /** + * @brief Application - is the application that is being initialized + * */ public Application Application { @@ -44,19 +44,19 @@ namespace Tizen.NUI { _application = value; } - } - } - - /** - * @brief Event arguments that passed via NUIApplicationTerminate signal - * - */ - public class NUIApplicationTerminateEventArgs : EventArgs + } + } + + /** + * @brief Event arguments that passed via NUIApplicationTerminate signal + * + */ + internal class NUIApplicationTerminateEventArgs : EventArgs { private Application _application; - /** - * @brief Application - is the application that is being Terminated - * + /** + * @brief Application - is the application that is being Terminated + * */ public Application Application { @@ -68,19 +68,19 @@ namespace Tizen.NUI { _application = value; } - } - } - - /** - * @brief Event arguments that passed via NUIApplicationPause signal - * - */ - public class NUIApplicationPauseEventArgs : EventArgs + } + } + + /** + * @brief Event arguments that passed via NUIApplicationPause signal + * + */ + internal class NUIApplicationPauseEventArgs : EventArgs { private Application _application; - /** - * @brief Application - is the application that is being Paused - * + /** + * @brief Application - is the application that is being Paused + * */ public Application Application { @@ -92,19 +92,19 @@ namespace Tizen.NUI { _application = value; } - } - } - - /** - * @brief Event arguments that passed via NUIApplicationResume signal - * - */ - public class NUIApplicationResumeEventArgs : EventArgs + } + } + + /** + * @brief Event arguments that passed via NUIApplicationResume signal + * + */ + internal class NUIApplicationResumeEventArgs : EventArgs { private Application _application; - /** - * @brief Application - is the application that is being Resumed - * + /** + * @brief Application - is the application that is being Resumed + * */ public Application Application { @@ -116,19 +116,19 @@ namespace Tizen.NUI { _application = value; } - } - } - - /** - * @brief Event arguments that passed via NUIApplicationReset signal - * - */ - public class NUIApplicationResetEventArgs : EventArgs + } + } + + /** + * @brief Event arguments that passed via NUIApplicationReset signal + * + */ + internal class NUIApplicationResetEventArgs : EventArgs { private Application _application; - /** - * @brief Application - is the application that is being Reset - * + /** + * @brief Application - is the application that is being Reset + * */ public Application Application { @@ -140,19 +140,19 @@ namespace Tizen.NUI { _application = value; } - } - } - - /** - * @brief Event arguments that passed via NUIApplicationResize signal - * - */ - public class NUIApplicationResizeEventArgs : EventArgs + } + } + + /** + * @brief Event arguments that passed via NUIApplicationResize signal + * + */ + internal class NUIApplicationResizeEventArgs : EventArgs { private Application _application; - /** - * @brief Application - is the application that is being Resized - * + /** + * @brief Application - is the application that is being Resized + * */ public Application Application { @@ -164,19 +164,19 @@ namespace Tizen.NUI { _application = value; } - } - } - - /** - * @brief Event arguments that passed via NUIApplicationLanguageChanged signal - * - */ - public class NUIApplicationLanguageChangedEventArgs : EventArgs + } + } + + /** + * @brief Event arguments that passed via NUIApplicationLanguageChanged signal + * + */ + internal class NUIApplicationLanguageChangedEventArgs : EventArgs { private Application _application; - /** - * @brief Application - is the application that is being affected with Device's language change - * + /** + * @brief Application - is the application that is being affected with Device's language change + * */ public Application Application { @@ -188,19 +188,19 @@ namespace Tizen.NUI { _application = value; } - } - } - - /** - * @brief Event arguments that passed via NUIApplicationRegionChanged signal - * - */ - public class NUIApplicationRegionChangedEventArgs : EventArgs + } + } + + /** + * @brief Event arguments that passed via NUIApplicationRegionChanged signal + * + */ + internal class NUIApplicationRegionChangedEventArgs : EventArgs { private Application _application; - /** - * @brief Application - is the application that is being affected with Device's region change - * + /** + * @brief Application - is the application that is being affected with Device's region change + * */ public Application Application { @@ -212,19 +212,19 @@ namespace Tizen.NUI { _application = value; } - } - } - - /** - * @brief Event arguments that passed via NUIApplicationBatteryLow signal - * - */ - public class NUIApplicationBatteryLowEventArgs : EventArgs + } + } + + /** + * @brief Event arguments that passed via NUIApplicationBatteryLow signal + * + */ + internal class NUIApplicationBatteryLowEventArgs : EventArgs { private Application _application; - /** - * @brief Application - is the application that is being affected when the battery level of the device is low - * + /** + * @brief Application - is the application that is being affected when the battery level of the device is low + * */ public Application Application { @@ -236,19 +236,19 @@ namespace Tizen.NUI { _application = value; } - } - } - - /** - * @brief Event arguments that passed via NUIApplicationMemoryLow signal - * - */ - public class NUIApplicationMemoryLowEventArgs : EventArgs + } + } + + /** + * @brief Event arguments that passed via NUIApplicationMemoryLow signal + * + */ + internal class NUIApplicationMemoryLowEventArgs : EventArgs { private Application _application; - /** - * @brief Application - is the application that is being affected when the memory level of the device is low - * + /** + * @brief Application - is the application that is being affected when the memory level of the device is low + * */ public Application Application { @@ -260,20 +260,20 @@ namespace Tizen.NUI { _application = value; } - } - } - - /** - * @brief Event arguments that passed via NUIApplicationAppControl signal - * - */ - public class NUIApplicationAppControlEventArgs : EventArgs + } + } + + /** + * @brief Event arguments that passed via NUIApplicationAppControl signal + * + */ + internal class NUIApplicationAppControlEventArgs : EventArgs { private Application _application; private IntPtr _voidp; - /** - * @brief Application - is the application that is receiving the launch request from another application - * + /** + * @brief Application - is the application that is receiving the launch request from another application + * */ public Application Application { @@ -286,9 +286,9 @@ namespace Tizen.NUI _application = value; } } - /** - * @brief VoidP - contains the information about why the application is launched - * + /** + * @brief VoidP - contains the information about why the application is launched + * */ public IntPtr VoidP { @@ -300,10 +300,10 @@ namespace Tizen.NUI { _voidp = value; } - } + } } - public class Application : BaseHandle + internal class Application : BaseHandle { private global::System.Runtime.InteropServices.HandleRef swigCPtr; @@ -405,10 +405,10 @@ namespace Tizen.NUI private DaliEventHandler _applicationAppControlEventHandler; private NUIApplicationAppControlEventCallbackDelegate _applicationAppControlEventCallbackDelegate; - /** - * @brief Event for Initialized signal which can be used to subscribe/unsubscribe the event handler - * (in the type of NUIApplicationInitEventHandler - DaliEventHandler) - * provided by the user. Initialized signal is emitted when application is initialised + /** + * @brief Event for Initialized signal which can be used to subscribe/unsubscribe the event handler + * (in the type of NUIApplicationInitEventHandler - DaliEventHandler) + * provided by the user. Initialized signal is emitted when application is initialised */ public event DaliEventHandler Initialized { @@ -456,10 +456,10 @@ namespace Tizen.NUI } } - /** - * @brief Event for Terminated signal which can be used to subscribe/unsubscribe the event handler - * (in the type of NUIApplicationTerminateEventHandler-DaliEventHandler) - * provided by the user. Terminated signal is emitted when application is terminated + /** + * @brief Event for Terminated signal which can be used to subscribe/unsubscribe the event handler + * (in the type of NUIApplicationTerminateEventHandler-DaliEventHandler) + * provided by the user. Terminated signal is emitted when application is terminated */ public event DaliEventHandler Terminated { @@ -507,10 +507,10 @@ namespace Tizen.NUI } } - /** - * @brief Event for Paused signal which can be used to subscribe/unsubscribe the event handler - * (in the type of NUIApplicationPauseEventHandler-DaliEventHandler) - * provided by the user. Paused signal is emitted when application is paused + /** + * @brief Event for Paused signal which can be used to subscribe/unsubscribe the event handler + * (in the type of NUIApplicationPauseEventHandler-DaliEventHandler) + * provided by the user. Paused signal is emitted when application is paused */ public event DaliEventHandler Paused { @@ -558,10 +558,10 @@ namespace Tizen.NUI } } - /** - * @brief Event for Resumed signal which can be used to subscribe/unsubscribe the event handler - * (in the type of NUIApplicationResumeEventHandler-DaliEventHandler) - * provided by the user. Resumed signal is emitted when application is resumed + /** + * @brief Event for Resumed signal which can be used to subscribe/unsubscribe the event handler + * (in the type of NUIApplicationResumeEventHandler-DaliEventHandler) + * provided by the user. Resumed signal is emitted when application is resumed */ public event DaliEventHandler Resumed { @@ -609,10 +609,10 @@ namespace Tizen.NUI } } - /** - * @brief Event for Reset signal which can be used to subscribe/unsubscribe the event handler - * (in the type of NUIApplicationResetEventHandler-DaliEventHandler) - * provided by the user. Reset signal is emitted when application is reset + /** + * @brief Event for Reset signal which can be used to subscribe/unsubscribe the event handler + * (in the type of NUIApplicationResetEventHandler-DaliEventHandler) + * provided by the user. Reset signal is emitted when application is reset */ public event DaliEventHandler Reset { @@ -660,10 +660,10 @@ namespace Tizen.NUI } } - /** - * @brief Event for Resized signal which can be used to subscribe/unsubscribe the event handler - * (in the type of NUIApplicationResizeEventHandler-DaliEventHandler) - * provided by the user. Resized signal is emitted when application is resized + /** + * @brief Event for Resized signal which can be used to subscribe/unsubscribe the event handler + * (in the type of NUIApplicationResizeEventHandler-DaliEventHandler) + * provided by the user. Resized signal is emitted when application is resized */ public event DaliEventHandler Resized { @@ -711,10 +711,10 @@ namespace Tizen.NUI } } - /** - * @brief Event for LanguageChanged signal which can be used to subscribe/unsubscribe the event handler - * (in the type of NUIApplicationLanguageChangedEventHandler-DaliEventHandler) - * provided by the user. LanguageChanged signal is emitted when the region of the device is changed. + /** + * @brief Event for LanguageChanged signal which can be used to subscribe/unsubscribe the event handler + * (in the type of NUIApplicationLanguageChangedEventHandler-DaliEventHandler) + * provided by the user. LanguageChanged signal is emitted when the region of the device is changed. */ public event DaliEventHandler LanguageChanged { @@ -762,10 +762,10 @@ namespace Tizen.NUI } } - /** - * @brief Event for RegionChanged signal which can be used to subscribe/unsubscribe the event handler - * (in the type of NUIApplicationRegionChangedEventHandler-DaliEventHandler) - * provided by the user. RegionChanged signal is emitted when the region of the device is changed. + /** + * @brief Event for RegionChanged signal which can be used to subscribe/unsubscribe the event handler + * (in the type of NUIApplicationRegionChangedEventHandler-DaliEventHandler) + * provided by the user. RegionChanged signal is emitted when the region of the device is changed. */ public event DaliEventHandler RegionChanged { @@ -813,10 +813,10 @@ namespace Tizen.NUI } } - /** - * @brief Event for BatteryLow signal which can be used to subscribe/unsubscribe the event handler - * (in the type of NUIApplicationBatteryLowEventHandler-DaliEventHandler) - * provided by the user. BatteryLow signal is emitted when the battery level of the device is low. + /** + * @brief Event for BatteryLow signal which can be used to subscribe/unsubscribe the event handler + * (in the type of NUIApplicationBatteryLowEventHandler-DaliEventHandler) + * provided by the user. BatteryLow signal is emitted when the battery level of the device is low. */ public event DaliEventHandler BatteryLow { @@ -864,10 +864,10 @@ namespace Tizen.NUI } } - /** - * @brief Event for MemoryLow signal which can be used to subscribe/unsubscribe the event handler - * (in the type of NUIApplicationMemoryLowEventHandler-DaliEventHandler) - * provided by the user. MemoryLow signal is emitted when the memory level of the device is low. + /** + * @brief Event for MemoryLow signal which can be used to subscribe/unsubscribe the event handler + * (in the type of NUIApplicationMemoryLowEventHandler-DaliEventHandler) + * provided by the user. MemoryLow signal is emitted when the memory level of the device is low. */ public event DaliEventHandler MemoryLow { @@ -915,10 +915,10 @@ namespace Tizen.NUI } } - /** - * @brief Event for AppControl signal which can be used to subscribe/unsubscribe the event handler - * (in the type of NUIApplicationAppControlEventHandler-DaliEventHandler) - * provided by the user. AppControl signal is emitted when another application sends a launch request to the application. + /** + * @brief Event for AppControl signal which can be used to subscribe/unsubscribe the event handler + * (in the type of NUIApplicationAppControlEventHandler-DaliEventHandler) + * provided by the user. AppControl signal is emitted when another application sends a launch request to the application. */ public event DaliEventHandler AppControl { @@ -1090,8 +1090,8 @@ namespace Tizen.NUI - /** - * Outer::outer_method(int) + /** + * Outer::outer_method(int) */ public static Application New() { @@ -1308,6 +1308,6 @@ namespace Tizen.NUI Transparent = 1 } - } - -} + } + +} diff --git a/Tizen.NUI/src/public/Actor.cs b/Tizen.NUI/src/public/Actor.cs index 1f47787..04ae4f1 100755 --- a/Tizen.NUI/src/public/Actor.cs +++ b/Tizen.NUI/src/public/Actor.cs @@ -100,14 +100,6 @@ namespace Tizen.NUI } } - public bool Visibility - { - get - { - return IsVisible(); - } - } - public float Opacity { get diff --git a/Tizen.NUI/src/public/Animation.cs b/Tizen.NUI/src/public/Animation.cs index fdcfe52..a626665 100755 --- a/Tizen.NUI/src/public/Animation.cs +++ b/Tizen.NUI/src/public/Animation.cs @@ -80,11 +80,6 @@ namespace Tizen.NUI - private AnimationFinishedEventCallbackType _animationFinishedEventCallback; - [UnmanagedFunctionPointer(CallingConvention.StdCall)] - private delegate void AnimationFinishedEventCallbackType(IntPtr data); - private event EventHandler _animationFinishedEventHandler; - /** * @brief Create an initialized Animation. * @@ -101,6 +96,10 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } + private AnimationFinishedEventCallbackType _animationFinishedEventCallback; + [UnmanagedFunctionPointer(CallingConvention.StdCall)] + private delegate void AnimationFinishedEventCallbackType(IntPtr data); + private event EventHandler _animationFinishedEventHandler; /** * @brief Event for Finished signal which can be used to subscribe/unsubscribe the event handler * Finished signal is emitted when an Animation's animations have finished. @@ -119,12 +118,12 @@ namespace Tizen.NUI } remove { - if (_animationFinishedEventHandler != null) + _animationFinishedEventHandler -= value; + + if (_animationFinishedEventHandler == null && _animationFinishedEventCallback != null) { FinishedSignal().Disconnect(_animationFinishedEventCallback); } - - _animationFinishedEventHandler -= value; } } private void OnFinished(IntPtr data) @@ -401,7 +400,7 @@ namespace Tizen.NUI } } - public void AnimateBetween(Actor target, string property, KeyFrames keyFrames, AlphaFunction alphaFunction = null) + public void AnimateBetween(Actor target, string property, KeyFrames keyFrames, Interpolation interpolation = Interpolation.Linear, AlphaFunction alphaFunction = null) { string _str1 = property.Substring(0, 1); string _str2 = property.Substring(1); @@ -415,12 +414,11 @@ namespace Tizen.NUI if (alphaFunction != null) { - - AnimateBetween(_prop, keyFrames); + AnimateBetween(_prop, keyFrames, alphaFunction, interpolation); } else { - AnimateBetween(_prop, keyFrames, alphaFunction); + AnimateBetween(_prop, keyFrames, interpolation); } } diff --git a/Tizen.NUI/src/public/Button.cs b/Tizen.NUI/src/public/Button.cs index 4378eba..5523fd8 100755 --- a/Tizen.NUI/src/public/Button.cs +++ b/Tizen.NUI/src/public/Button.cs @@ -18,14 +18,14 @@ // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -// - +// + // This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts // Some have been manually changed @@ -100,12 +100,12 @@ namespace Tizen.NUI remove { - if (_clickedEventHandler != null) + _clickedEventHandler -= value; + + if (_clickedEventHandler == null && _clickedCallback != null) { ClickedSignal().Disconnect(_clickedCallback); } - - _clickedEventHandler -= value; } } @@ -141,12 +141,12 @@ namespace Tizen.NUI remove { - if (_pressedEventHandler != null) + _pressedEventHandler -= value; + + if (_pressedEventHandler == null && _pressedCallback != null) { this.PressedSignal().Disconnect(_pressedCallback); } - - _pressedEventHandler -= value; } } @@ -175,21 +175,18 @@ namespace Tizen.NUI _releasedCallback = OnReleased; ReleasedSignal().Connect(_releasedCallback); } - _releasedEventHandler += value; } remove { - lock (this) - { - if (_releasedEventHandler != null) - { - ReleasedSignal().Disconnect(_releasedCallback); - } + _releasedEventHandler -= value; - _releasedEventHandler -= value; + if (_releasedEventHandler == null && _releasedCallback != null) + { + ReleasedSignal().Disconnect(_releasedCallback); } + } } @@ -223,12 +220,12 @@ namespace Tizen.NUI remove { - if (_stateChangedEventHandler != null) + _stateChangedEventHandler -= value; + + if (_stateChangedEventHandler == null && _stateChangedCallback != null) { StateChangedSignal().Disconnect(_stateChangedCallback); } - - _stateChangedEventHandler -= value; } } @@ -791,6 +788,6 @@ namespace Tizen.NUI } } - } - + } + } \ No newline at end of file diff --git a/Tizen.NUI/src/public/FlexContainer.cs b/Tizen.NUI/src/public/FlexContainer.cs index 9359885..9628ef2 100755 --- a/Tizen.NUI/src/public/FlexContainer.cs +++ b/Tizen.NUI/src/public/FlexContainer.cs @@ -201,6 +201,10 @@ namespace Tizen.NUI return ret; } + /// + /// Enumeration for the direction of the main axis in the flex container. This determines + /// the direction that flex items are laid out in the flex container. + /// public enum FlexDirectionType { Column, @@ -216,6 +220,10 @@ namespace Tizen.NUI RTL } + /// + /// Enumeration for the alignment of the flex items when the items do not use all available + /// space on the main-axis. + /// public enum Justification { JustifyFlexStart, @@ -225,6 +233,10 @@ namespace Tizen.NUI JustifySpaceAround } + /// + /// Enumeration for the alignment of the flex items or lines when the items or lines do not + /// use all the available space on the cross-axis. + /// public enum Alignment { AlignAuto, @@ -233,6 +245,11 @@ namespace Tizen.NUI AlignFlexEnd, AlignStretch } + + /// + /// Enumeration for the wrap type of the flex container when there is no enough room for + /// all the items on one flex line. + /// public enum WrapType { NoWrap, @@ -247,82 +264,105 @@ namespace Tizen.NUI CHILD_PROPERTY_END_INDEX = PropertyRanges.CHILD_PROPERTY_REGISTRATION_START_INDEX + 1000 } - public int ContentDirection + /// + /// The primary direction in which content is ordered + /// + public ContentDirectionType ContentDirection { get { int temp = 0; GetProperty(FlexContainer.Property.CONTENT_DIRECTION).Get(ref temp); - return temp; + return (ContentDirectionType)temp; } set { - SetProperty(FlexContainer.Property.CONTENT_DIRECTION, new Tizen.NUI.PropertyValue(value)); + SetProperty(FlexContainer.Property.CONTENT_DIRECTION, new Tizen.NUI.PropertyValue((int)value)); } } - public int FlexDirection + + /// + /// The direction of the main-axis which determines the direction that flex items are laid out + /// + public FlexDirectionType FlexDirection { get { int temp = 0; GetProperty(FlexContainer.Property.FLEX_DIRECTION).Get(ref temp); - return temp; + return (FlexDirectionType)temp; } set { - SetProperty(FlexContainer.Property.FLEX_DIRECTION, new Tizen.NUI.PropertyValue(value)); + SetProperty(FlexContainer.Property.FLEX_DIRECTION, new Tizen.NUI.PropertyValue((int)value)); } } - public int FlexWrap + + /// + /// Whether the flex items should wrap or not if there is no enough room for them on one flex line + /// + public WrapType FlexWrap { get { int temp = 0; GetProperty(FlexContainer.Property.FLEX_WRAP).Get(ref temp); - return temp; + return (WrapType)temp; } set { - SetProperty(FlexContainer.Property.FLEX_WRAP, new Tizen.NUI.PropertyValue(value)); + SetProperty(FlexContainer.Property.FLEX_WRAP, new Tizen.NUI.PropertyValue((int)value)); } } - public int JustifyContent + + /// + /// The alignment of flex items when the items do not use all available space on the main-axis + /// + public Justification JustifyContent { get { int temp = 0; GetProperty(FlexContainer.Property.JUSTIFY_CONTENT).Get(ref temp); - return temp; + return (Justification)temp; } set { - SetProperty(FlexContainer.Property.JUSTIFY_CONTENT, new Tizen.NUI.PropertyValue(value)); + SetProperty(FlexContainer.Property.JUSTIFY_CONTENT, new Tizen.NUI.PropertyValue((int)value)); } } - public int AlignItems + + /// + /// The alignment of flex items when the items do not use all available space on the cross-axis + /// + public Alignment AlignItems { get { int temp = 0; GetProperty(FlexContainer.Property.ALIGN_ITEMS).Get(ref temp); - return temp; + return (Alignment)temp; } set { - SetProperty(FlexContainer.Property.ALIGN_ITEMS, new Tizen.NUI.PropertyValue(value)); + SetProperty(FlexContainer.Property.ALIGN_ITEMS, new Tizen.NUI.PropertyValue((int)value)); } } - public int AlignContent + + /// + /// Similar to "alignItems", but it aligns flex lines, so only works when there are multiple lines + /// + public Alignment AlignContent { get { int temp = 0; GetProperty(FlexContainer.Property.ALIGN_CONTENT).Get(ref temp); - return temp; + return (Alignment)temp; } set { - SetProperty(FlexContainer.Property.ALIGN_CONTENT, new Tizen.NUI.PropertyValue(value)); + SetProperty(FlexContainer.Property.ALIGN_CONTENT, new Tizen.NUI.PropertyValue((int)value)); } } diff --git a/Tizen.NUI/src/public/FocusManager.cs b/Tizen.NUI/src/public/FocusManager.cs index 4124bab..bea570a 100755 --- a/Tizen.NUI/src/public/FocusManager.cs +++ b/Tizen.NUI/src/public/FocusManager.cs @@ -145,11 +145,11 @@ namespace Tizen.NUI } remove { - if (_preFocusChangeEventHandler != null) + _preFocusChangeEventHandler -= value; + if (_preFocusChangeEventHandler == null && _preFocusChangeCallback != null) { PreFocusChangeSignal().Disconnect(_preFocusChangeCallback); } - _preFocusChangeEventHandler -= value; } } @@ -222,11 +222,12 @@ namespace Tizen.NUI } remove { - if (_focusChangedEventCallback != null) + _focusChangedEventHandler -= value; + + if (_focusChangedEventCallback == null && _focusChangedEventCallback != null) { FocusChangedSignal().Disconnect(_focusChangedEventCallback); } - _focusChangedEventHandler -= value; } } @@ -296,11 +297,12 @@ namespace Tizen.NUI } remove { - if (_focusGroupChangedEventCallback != null) + _focusGroupChangedEventHandler -= value; + + if (_focusGroupChangedEventCallback == null && _focusGroupChangedEventCallback != null) { FocusGroupChangedSignal().Disconnect(_focusGroupChangedEventCallback); } - _focusGroupChangedEventHandler -= value; } } @@ -357,11 +359,12 @@ namespace Tizen.NUI } remove { - if (_focusedViewEnterKeyEventCallback != null) + _focusedViewEnterKeyEventHandler -= value; + + if (_focusedViewEnterKeyEventCallback == null && _focusedViewEnterKeyEventCallback != null) { FocusedActorEnterKeySignal().Disconnect(_focusedViewEnterKeyEventCallback); } - _focusedViewEnterKeyEventHandler -= value; } } diff --git a/Tizen.NUI/src/public/NUIApplication.cs b/Tizen.NUI/src/public/NUIApplication.cs index 6ba6408..bdc1679 100755 --- a/Tizen.NUI/src/public/NUIApplication.cs +++ b/Tizen.NUI/src/public/NUIApplication.cs @@ -22,26 +22,61 @@ using Tizen.NUI; namespace Tizen.NUI { + /// + /// Represents an application that have UI screen. The NUIApplication class has a default stage. + /// public class NUIApplication : CoreUIApplication { private void LOG(string _str) { - Tizen.Log.Debug("NUI", _str); + //Tizen.Log.Debug("NUI", _str); //Console.WriteLine("[NUI]" + _str); } + /// + /// The instance of the Application. + /// + /// + /// This application is created before OnCreate() or created event. And the NUIApplication will be terminated when this application is closed. + /// private Application _application; + + /// + /// The instance of the Dali Application extension. + /// private ApplicationExtensions _applicationExt; + + /// + /// Store the stylesheet value. + /// private string _stylesheet; + + /// + /// Store the window mode value. + /// private Application.WindowMode _windowMode; + + /// + /// Store the app mode value. + /// private AppMode _appMode; + + /// + /// The instance of the Dali Stage. + /// private Stage _stage; + /// + /// The default constructor. + /// public NUIApplication() : base() { _appMode = AppMode.Default; } + /// + /// The constructor with stylesheet. + /// public NUIApplication(string stylesheet) : base() { //handle the stylesheet @@ -49,15 +84,20 @@ namespace Tizen.NUI _stylesheet = stylesheet; } - public NUIApplication(string stylesheet, Application.WindowMode windowMode) : base() + /// + /// The constructor with stylesheet and window mode. + /// + public NUIApplication(string stylesheet, WindowMode windowMode) : base() { //handle the stylesheet and windowMode _appMode = AppMode.StyleSheetWithWindowMode; _stylesheet = stylesheet; - _windowMode = windowMode; + _windowMode = (Application.WindowMode)windowMode; } - + /// + /// Overrides this method if want to handle behavior. + /// protected override void OnPause() { base.OnPause(); @@ -65,6 +105,10 @@ namespace Tizen.NUI LOG("OnPause() is called!"); } + /// + /// Overrides this method if want to handle behavior before calling OnCreate(). + /// stage property is initialized in this overrided method. + /// protected override void OnPreCreate() { switch (_appMode) @@ -89,6 +133,9 @@ namespace Tizen.NUI LOG("OnPreCreate() is called!"); } + /// + /// Overrides this method if want to handle behavior. + /// protected override void OnResume() { base.OnResume(); @@ -96,6 +143,9 @@ namespace Tizen.NUI LOG("OnResume() is called!"); } + /// + /// Overrides this method if want to handle behavior. + /// protected override void OnAppControlReceived(AppControlReceivedEventArgs e) { base.OnAppControlReceived(e); @@ -107,12 +157,18 @@ namespace Tizen.NUI } } + /// + /// Overrides this method if want to handle behavior. + /// protected override void OnCreate() { base.OnCreate(); LOG("OnCreate() is called!"); } + /// + /// Overrides this method if want to handle behavior. + /// protected override void OnLocaleChanged(LocaleChangedEventArgs e) { base.OnLocaleChanged(e); @@ -120,24 +176,36 @@ namespace Tizen.NUI LOG("OnLocaleChanged() is called!"); } + /// + /// Overrides this method if want to handle behavior. + /// protected override void OnLowBattery(LowBatteryEventArgs e) { base.OnLowBattery(e); LOG("OnLowBattery() is called!"); } + /// + /// Overrides this method if want to handle behavior. + /// protected override void OnLowMemory(LowMemoryEventArgs e) { base.OnLowMemory(e); LOG("OnLowMemory() is called!"); } + /// + /// Overrides this method if want to handle behavior. + /// protected override void OnRegionFormatChanged(RegionFormatChangedEventArgs e) { base.OnRegionFormatChanged(e); LOG("OnRegionFormatChanged() is called!"); } + /// + /// Overrides this method if want to handle behavior. + /// protected override void OnTerminate() { base.OnTerminate(); @@ -145,11 +213,24 @@ namespace Tizen.NUI LOG("OnTerminate() is called!"); } + /// + /// The mode of creating NUI application. + /// private enum AppMode { Default = 0, StyleSheetOnly = 1, StyleSheetWithWindowMode = 2 } + + /// + /// Enumeration for deciding whether a NUI application window is opaque or transparent. + /// + public enum WindowMode + { + Opaque = 0, + Transparent = 1 + } + } } diff --git a/Tizen.NUI/src/public/Popup.cs b/Tizen.NUI/src/public/Popup.cs index 450cc14..91febd1 100755 --- a/Tizen.NUI/src/public/Popup.cs +++ b/Tizen.NUI/src/public/Popup.cs @@ -140,12 +140,12 @@ namespace Tizen.NUI } remove { - if (_popUpOutsideTouchedEventCallback != null) + _popUpOutsideTouchedEventHandler -= value; + + if (_popUpOutsideTouchedEventCallback == null && _popUpOutsideTouchedEventCallback != null) { OutsideTouchedSignal().Disconnect(_popUpOutsideTouchedEventCallback); - } - _popUpOutsideTouchedEventHandler -= value; } } @@ -173,11 +173,12 @@ namespace Tizen.NUI remove { - if (_popUpShowingEventCallback != null) + _popUpShowingEventHandler -= value; + + if (_popUpShowingEventCallback == null && _popUpShowingEventCallback != null) { ShowingSignal().Disconnect(_popUpShowingEventCallback); } - _popUpShowingEventHandler -= value; } } @@ -206,11 +207,12 @@ namespace Tizen.NUI remove { - if (_popUpShownEventCallback == null) + _popUpShownEventHandler -= value; + + if (_popUpShownEventCallback == null && _popUpShownEventCallback != null) { ShownSignal().Disconnect(_popUpShownEventCallback); } - _popUpShownEventHandler -= value; } } @@ -238,11 +240,12 @@ namespace Tizen.NUI remove { - if (_popUpHidingEventCallback != null) + _popUpHidingEventHandler -= value; + + if (_popUpHidingEventCallback == null && _popUpHidingEventCallback != null) { HidingSignal().Disconnect(_popUpHidingEventCallback); } - _popUpHidingEventHandler -= value; } } @@ -269,11 +272,12 @@ namespace Tizen.NUI } remove { - if (_popUpHiddenEventCallback != null) + _popUpHiddenEventHandler -= value; + + if (_popUpHiddenEventCallback == null && _popUpHiddenEventCallback != null) { HiddenSignal().Disconnect(_popUpHiddenEventCallback); } - _popUpHiddenEventHandler -= value; } } diff --git a/Tizen.NUI/src/public/Stage.cs b/Tizen.NUI/src/public/Stage.cs index cdfe67b..7c34b64 100755 --- a/Tizen.NUI/src/public/Stage.cs +++ b/Tizen.NUI/src/public/Stage.cs @@ -131,12 +131,12 @@ namespace Tizen.NUI } remove { - if (_stageTouchEventHandler != null) + _stageTouchEventHandler -= value; + + if (_stageTouchEventHandler == null && _stageTouchCallback != null) { TouchSignal().Disconnect(_stageTouchCallback); } - - _stageTouchEventHandler -= value; } } @@ -200,12 +200,13 @@ namespace Tizen.NUI } remove { - if (_stageWheelEventHandler != null) + _stageWheelEventHandler -= value; + + if (_stageWheelEventHandler == null && _stageWheelCallback != null) { WheelEventSignal().Disconnect(_stageWheelCallback); } - _stageWheelEventHandler -= value; } } @@ -269,12 +270,12 @@ namespace Tizen.NUI } remove { - if (_stageKeyEventHandler != null) + _stageKeyEventHandler -= value; + + if (_stageKeyEventHandler == null && _stageKeyCallback != null) { KeyEventSignal().Disconnect(_stageKeyCallback); } - - _stageKeyEventHandler -= value; } } @@ -318,12 +319,12 @@ namespace Tizen.NUI } remove { - if (_stageEventProcessingFinishedEventHandler != null) + _stageEventProcessingFinishedEventHandler -= value; + + if (_stageEventProcessingFinishedEventHandler == null && _stageEventProcessingFinishedEventCallback != null) { EventProcessingFinishedSignal().Disconnect(_stageEventProcessingFinishedEventCallback); } - - _stageEventProcessingFinishedEventHandler -= value; } } @@ -359,12 +360,12 @@ namespace Tizen.NUI } remove { - if (_stageContextLostEventHandler != null) + _stageContextLostEventHandler -= value; + + if (_stageContextLostEventHandler == null && _stageContextLostEventCallback != null) { ContextLostSignal().Disconnect(_stageContextLostEventCallback); } - - _stageContextLostEventHandler -= value; } } @@ -401,12 +402,12 @@ namespace Tizen.NUI } remove { - if (_stageContextRegainedEventHandler != null) + _stageContextRegainedEventHandler -= value; + + if (_stageContextRegainedEventHandler == null && _stageContextRegainedEventCallback != null) { ContextRegainedSignal().Disconnect(_stageContextRegainedEventCallback); } - - _stageContextRegainedEventHandler -= value; } } @@ -442,12 +443,13 @@ namespace Tizen.NUI } remove { - if (_stageSceneCreatedEventHandler != null) + _stageSceneCreatedEventHandler -= value; + + if (_stageSceneCreatedEventHandler == null && _stageSceneCreatedEventCallback != null) { SceneCreatedSignal().Disconnect(_stageSceneCreatedEventCallback); } - _stageSceneCreatedEventHandler -= value; } } diff --git a/Tizen.NUI/src/public/Timer.cs b/Tizen.NUI/src/public/Timer.cs index 0cae3cb..96be00b 100755 --- a/Tizen.NUI/src/public/Timer.cs +++ b/Tizen.NUI/src/public/Timer.cs @@ -178,12 +178,13 @@ namespace Tizen.NUI } remove { - if (_tickCallBack != null) + _tickEventHandler -= value; + + if (_tickCallBack == null && _tickCallBack != null) { this.TickSignal().Disconnect(_tickCallBack); _tickCallBack = null; } - _tickEventHandler -= value; } } private bool OnTick() diff --git a/Tizen.NUI/src/public/View.cs b/Tizen.NUI/src/public/View.cs index cc67900..e3323f6 100755 --- a/Tizen.NUI/src/public/View.cs +++ b/Tizen.NUI/src/public/View.cs @@ -58,11 +58,11 @@ namespace Tizen.NUI public override void Dispose() { - if (!Stage.IsInstalled()) - { - DisposeQueue.Instance.Add(this); - return; - } + if (!Stage.IsInstalled()) + { + DisposeQueue.Instance.Add(this); + return; + } lock (this) { @@ -104,12 +104,12 @@ namespace Tizen.NUI remove { - if (_keyInputFocusGainedEventHandler != null) + _keyInputFocusGainedEventHandler -= value; + + if (_keyInputFocusGainedEventHandler == null && _keyInputFocusGainedCallback != null) { this.KeyInputFocusGainedSignal().Disconnect(_keyInputFocusGainedCallback); } - - _keyInputFocusGainedEventHandler -= value; } } @@ -146,12 +146,12 @@ namespace Tizen.NUI remove { - if (_keyInputFocusLostEventHandler != null) + _keyInputFocusLostEventHandler -= value; + + if (_keyInputFocusLostEventHandler == null && _keyInputFocusLostCallback != null) { this.KeyInputFocusLostSignal().Disconnect(_keyInputFocusLostCallback); } - - _keyInputFocusLostEventHandler -= value; } } @@ -213,12 +213,12 @@ namespace Tizen.NUI remove { - if (_keyEventHandler != null) + _keyEventHandler -= value; + + if (_keyEventHandler == null && _keyCallback != null) { this.KeyEventSignal().Disconnect(_keyCallback); } - - _keyEventHandler -= value; } } @@ -260,12 +260,13 @@ namespace Tizen.NUI remove { - if (_onRelayoutEventHandler != null) + _onRelayoutEventHandler -= value; + + if (_onRelayoutEventHandler == null && _onRelayoutEventCallback != null) { this.OnRelayoutSignal().Disconnect(_onRelayoutEventCallback); } - _onRelayoutEventHandler -= value; } } @@ -328,12 +329,13 @@ namespace Tizen.NUI remove { - if (_touchDataEventHandler != null) + _touchDataEventHandler -= value; + + if (_touchDataEventHandler == null && _touchDataCallback != null) { this.TouchSignal().Disconnect(_touchDataCallback); } - _touchDataEventHandler -= value; } } @@ -401,12 +403,13 @@ namespace Tizen.NUI remove { - if (_hoverEventHandler != null) + _hoverEventHandler -= value; + + if (_hoverEventHandler == null && _hoverEventCallback != null) { this.HoveredSignal().Disconnect(_hoverEventCallback); } - _hoverEventHandler -= value; } } @@ -473,12 +476,13 @@ namespace Tizen.NUI remove { - if (_wheelEventHandler != null) + _wheelEventHandler -= value; + + if (_wheelEventHandler == null && _wheelEventCallback != null) { this.WheelEventSignal().Disconnect(_wheelEventCallback); } - _wheelEventHandler -= value; } } @@ -521,12 +525,12 @@ namespace Tizen.NUI remove { - if (_onStageEventHandler != null) + _onStageEventHandler -= value; + + if (_onStageEventHandler == null && _onStageEventCallback != null) { this.OnStageSignal().Disconnect(_onStageEventCallback); } - - _onStageEventHandler -= value; } } @@ -564,11 +568,12 @@ namespace Tizen.NUI remove { - if (_offStageEventHandler != null) + _offStageEventHandler -= value; + + if (_offStageEventHandler == null && _offStageEventCallback != null) { this.OnStageSignal().Disconnect(_offStageEventCallback); } - _offStageEventHandler -= value; } } @@ -956,6 +961,11 @@ namespace Tizen.NUI } } + /// + /// Child Property of FlexContainer + /// The proportion of the free space in the container the flex item will receive. + /// If all items in the container set this property, their sizes will be proportional to the specified flex factor + /// public float Flex { get @@ -969,6 +979,11 @@ namespace Tizen.NUI SetProperty(FlexContainer.ChildProperty.FLEX, new Tizen.NUI.PropertyValue(value)); } } + + /// + /// Child Property of FlexContainer + /// The alignment of the flex item along the cross axis, which, if set, overides the default alignment for all items in the container + /// public int AlignSelf { get @@ -982,6 +997,11 @@ namespace Tizen.NUI SetProperty(FlexContainer.ChildProperty.ALIGN_SELF, new Tizen.NUI.PropertyValue(value)); } } + + /// + /// Child Property of FlexContainer + /// The space around the flex item + /// public Vector4 FlexMargin { get diff --git a/packaging/csapi-nui.spec b/packaging/csapi-nui.spec index e9e013f..f2af8c7 100755 --- a/packaging/csapi-nui.spec +++ b/packaging/csapi-nui.spec @@ -1,6 +1,6 @@ Name: csapi-nui Summary: dali-NUI -Version: 1.0.0 +Version: 1.0.1 Release: 0 Group: Development/Libraries License: Apache-2.0 -- 2.7.4