From: xb.teng Date: Wed, 31 May 2017 17:11:11 +0000 (+0800) Subject: Add more things X-Git-Tag: submit/trunk/20170823.075128~91^2~35^2~48^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6df044b867d1b18362b5e3f0dec0e18b158a527a;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git Add more things Fixed nui jira-376(http://suprem.sec.samsung.net/jira/browse/NUI-376): 1. Add initial value for AnimateVisual, 2. Add default parameter for AnimateVisual, 3. Use "Position" to replace "Offset" to do visual animation, 4. Merge as-is-support.zip, 5. Fix null stage handle issue of window. Change-Id: I24a37a3adf996b5c28bd0746ee916990ed0342fb --- diff --git a/src/Tizen.NUI/src/internal/ViewRegistry.cs b/src/Tizen.NUI/src/internal/ViewRegistry.cs index 507f903..9e7fa13 100755 --- a/src/Tizen.NUI/src/internal/ViewRegistry.cs +++ b/src/Tizen.NUI/src/internal/ViewRegistry.cs @@ -302,11 +302,12 @@ namespace Tizen.NUI } } - public static View GetViewFromActor(View view) + + internal static View GetViewFromBaseHandle(BaseHandle baseHandle) { // we store a dictionary of ref-obects (C++ land) to custom views (C# land) - RefObject refObj = view.GetObjectPtr(); + RefObject refObj = baseHandle.GetObjectPtr(); IntPtr refObjectPtr = (IntPtr)RefObject.getCPtr(refObj); WeakReference viewReference; diff --git a/src/Tizen.NUI/src/public/BaseComponents/View.cs b/src/Tizen.NUI/src/public/BaseComponents/View.cs index bb69124..9ea3d8f 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/View.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/View.cs @@ -905,7 +905,7 @@ namespace Tizen.NUI.BaseComponents /// A object which inherit View public static T DownCast(View view) where T : View { - View ret = ViewRegistry.GetViewFromActor(view); + View ret = ViewRegistry.GetViewFromBaseHandle(view); if (ret != null) { return (T)ret; @@ -1914,14 +1914,14 @@ namespace Tizen.NUI.BaseComponents SetVisible(false); } - public void Raise() + internal void Raise() { NDalicPINVOKE.Raise(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void Lower() + internal void Lower() { NDalicPINVOKE.Lower(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) @@ -2094,10 +2094,18 @@ namespace Tizen.NUI.BaseComponents /// The view for the given index or empty handle if children not initialized public View GetChildAt(uint index) { - View ret = new View(NDalicPINVOKE.Actor_GetChildAt(swigCPtr, index), true); + IntPtr cPtr = NDalicPINVOKE.Actor_GetChildAt(swigCPtr, index); + cPtr = NDalicPINVOKE.View_SWIGUpcast(cPtr); + cPtr = NDalicPINVOKE.Handle_SWIGUpcast(cPtr); + + BaseHandle ret = new BaseHandle(cPtr, false); + + View temp = ViewRegistry.GetViewFromBaseHandle(ret); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; + + return temp ?? null; } /// @@ -2205,7 +2213,7 @@ namespace Tizen.NUI.BaseComponents return ret; } - public Vector3 GetNaturalSize() + internal Vector3 GetNaturalSize() { Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetNaturalSize(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) diff --git a/src/Tizen.NUI/src/public/BaseComponents/VisualView.cs b/src/Tizen.NUI/src/public/BaseComponents/VisualView.cs index 60fcc01..935e496 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/VisualView.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/VisualView.cs @@ -213,80 +213,83 @@ namespace Tizen.NUI.BaseComponents /// The end time of visual animation. /// The alpha function of visual animation /// Animation instance - public Animation AnimateVisual(VisualMap target, string property, object destinationValue, int startTime, int endTime, AlphaFunction.BuiltinFunctions alphaFunction) + public Animation AnimateVisual(VisualMap target, string property, object destinationValue, int startTime, int endTime, AlphaFunction.BuiltinFunctions? alphaFunction = null, object initialValue = null) { - string _alphaFunction = ""; - switch (alphaFunction) + string _alphaFunction = null; + if (alphaFunction != null) { - case Tizen.NUI.AlphaFunction.BuiltinFunctions.Linear: + switch (alphaFunction) { - _alphaFunction = "LINEAR"; - break; - } - case Tizen.NUI.AlphaFunction.BuiltinFunctions.Reverse: - { - _alphaFunction = "REVERSE"; - break; - } - case Tizen.NUI.AlphaFunction.BuiltinFunctions.EaseInSquare: - { - _alphaFunction = "EASE_IN_SQUARE"; - break; - } - case Tizen.NUI.AlphaFunction.BuiltinFunctions.EaseOutSquare: - { - _alphaFunction = "EASE_OUT_SQUARE"; - break; - } - case Tizen.NUI.AlphaFunction.BuiltinFunctions.EaseIn: - { - _alphaFunction = "EASE_IN"; - break; - } - case Tizen.NUI.AlphaFunction.BuiltinFunctions.EaseOut: - { - _alphaFunction = "EASE_OUT"; - break; - } - case Tizen.NUI.AlphaFunction.BuiltinFunctions.EaseInOut: - { - _alphaFunction = "EASE_IN_OUT"; - break; - } - case Tizen.NUI.AlphaFunction.BuiltinFunctions.EaseInSine: - { - _alphaFunction = "EASE_IN_SINE"; - break; - } - case Tizen.NUI.AlphaFunction.BuiltinFunctions.EaseOutSine: - { - _alphaFunction = "EASE_OUT_SINE"; - break; - } - case Tizen.NUI.AlphaFunction.BuiltinFunctions.EaseInOutSine: - { - _alphaFunction = "EASE_IN_OUT_SINE"; - break; - } - case Tizen.NUI.AlphaFunction.BuiltinFunctions.Bounce: - { - _alphaFunction = "BOUNCE"; - break; - } - case Tizen.NUI.AlphaFunction.BuiltinFunctions.Sin: - { - _alphaFunction = "SIN"; - break; - } - case Tizen.NUI.AlphaFunction.BuiltinFunctions.EaseOutBack: - { - _alphaFunction = "EASE_OUT_BACK"; - break; - } - default: - { - _alphaFunction = "DEFAULT"; - break; + case Tizen.NUI.AlphaFunction.BuiltinFunctions.Linear: + { + _alphaFunction = "LINEAR"; + break; + } + case Tizen.NUI.AlphaFunction.BuiltinFunctions.Reverse: + { + _alphaFunction = "REVERSE"; + break; + } + case Tizen.NUI.AlphaFunction.BuiltinFunctions.EaseInSquare: + { + _alphaFunction = "EASE_IN_SQUARE"; + break; + } + case Tizen.NUI.AlphaFunction.BuiltinFunctions.EaseOutSquare: + { + _alphaFunction = "EASE_OUT_SQUARE"; + break; + } + case Tizen.NUI.AlphaFunction.BuiltinFunctions.EaseIn: + { + _alphaFunction = "EASE_IN"; + break; + } + case Tizen.NUI.AlphaFunction.BuiltinFunctions.EaseOut: + { + _alphaFunction = "EASE_OUT"; + break; + } + case Tizen.NUI.AlphaFunction.BuiltinFunctions.EaseInOut: + { + _alphaFunction = "EASE_IN_OUT"; + break; + } + case Tizen.NUI.AlphaFunction.BuiltinFunctions.EaseInSine: + { + _alphaFunction = "EASE_IN_SINE"; + break; + } + case Tizen.NUI.AlphaFunction.BuiltinFunctions.EaseOutSine: + { + _alphaFunction = "EASE_OUT_SINE"; + break; + } + case Tizen.NUI.AlphaFunction.BuiltinFunctions.EaseInOutSine: + { + _alphaFunction = "EASE_IN_OUT_SINE"; + break; + } + case Tizen.NUI.AlphaFunction.BuiltinFunctions.Bounce: + { + _alphaFunction = "BOUNCE"; + break; + } + case Tizen.NUI.AlphaFunction.BuiltinFunctions.Sin: + { + _alphaFunction = "SIN"; + break; + } + case Tizen.NUI.AlphaFunction.BuiltinFunctions.EaseOutBack: + { + _alphaFunction = "EASE_OUT_BACK"; + break; + } + default: + { + _alphaFunction = "DEFAULT"; + break; + } } } @@ -295,7 +298,7 @@ namespace Tizen.NUI.BaseComponents if (item.Value.Name == target.Name) { PropertyMap _animator = new PropertyMap(); - _animator.Add("alphaFunction", new PropertyValue(_alphaFunction)); + if ( _alphaFunction != null) {_animator.Add("alphaFunction", new PropertyValue(_alphaFunction));} PropertyMap _timePeriod = new PropertyMap(); _timePeriod.Add("duration", new PropertyValue((endTime - startTime) / 1000.0f)); @@ -305,13 +308,19 @@ namespace Tizen.NUI.BaseComponents string _str1 = property.Substring(0, 1); string _str2 = property.Substring(1); string _str = _str1.ToLower() + _str2; + if (_str == "position") {_str = "offset";} - PropertyValue val = PropertyValue.CreateFromObject(destinationValue); + PropertyValue destVal = PropertyValue.CreateFromObject(destinationValue); PropertyMap _transition = new PropertyMap(); _transition.Add("target", new PropertyValue(target.Name)); _transition.Add("property", new PropertyValue(_str)); - _transition.Add("targetValue", val); + if (initialValue != null) + { + PropertyValue initVal = PropertyValue.CreateFromObject(initialValue); + _transition.Add("initialValue", new PropertyValue(initVal)); + } + _transition.Add("targetValue", destVal); _transition.Add("animator", new PropertyValue(_animator)); TransitionData _transitionData = new TransitionData(_transition); @@ -323,7 +332,7 @@ namespace Tizen.NUI.BaseComponents //temporary fix to pass TCT - public Animation VisualAnimate(VisualAnimator visualMap) + public Animation VisualAnimate(Tizen.NUI.VisualAnimator visualMap) { foreach (var item in _visualDictionary.ToList()) { diff --git a/src/Tizen.NUI/src/public/Layer.cs b/src/Tizen.NUI/src/public/Layer.cs index 26df66c..e7de055 100755 --- a/src/Tizen.NUI/src/public/Layer.cs +++ b/src/Tizen.NUI/src/public/Layer.cs @@ -26,7 +26,10 @@ namespace Tizen.NUI { + using System; + using System.Runtime.InteropServices; using Tizen.NUI.BaseComponents; + /// /// Layers provide a mechanism for overlaying groups of actors on top of each other. /// @@ -440,10 +443,18 @@ namespace Tizen.NUI /// The view for the given index or empty handle if children not initialized public View GetChildAt(uint index) { - View ret = new View(NDalicPINVOKE.Actor_GetChildAt(swigCPtr, index), true); + IntPtr cPtr = NDalicPINVOKE.Actor_GetChildAt(swigCPtr, index); + cPtr = NDalicPINVOKE.View_SWIGUpcast(cPtr); + cPtr = NDalicPINVOKE.Handle_SWIGUpcast(cPtr); + + BaseHandle ret = new BaseHandle(cPtr, false); + + View temp = ViewRegistry.GetViewFromBaseHandle(ret); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; + + return temp ?? null; } /// diff --git a/src/Tizen.NUI/src/public/Window.cs b/src/Tizen.NUI/src/public/Window.cs index 7da0d14..d9913a0 100755 --- a/src/Tizen.NUI/src/public/Window.cs +++ b/src/Tizen.NUI/src/public/Window.cs @@ -43,7 +43,10 @@ namespace Tizen.NUI internal Window(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Window_SWIGUpcast(cPtr), cMemoryOwn) { swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - stageCPtr = new global::System.Runtime.InteropServices.HandleRef(this, NDalicPINVOKE.Stage_GetCurrent()); + if (NDalicPINVOKE.Stage_IsInstalled()) + { + stageCPtr = new global::System.Runtime.InteropServices.HandleRef(this, NDalicPINVOKE.Stage_GetCurrent()); + } } internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Window obj)