From: dongsug.song Date: Tue, 9 May 2017 08:15:09 +0000 (+0900) Subject: nui 0.2.28 release X-Git-Tag: submit/trunk/20170823.075128~91^2~186 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=965aa0438fbff47c980428527729c15261695784;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git nui 0.2.28 release Change-Id: I0e15f213f8dbae1143fddab8031e79e8c43e06d9 Signed-off-by: dongsug.song --- diff --git a/packaging/csapi-nui.spec b/packaging/csapi-nui.spec index 5f2ca99..a3f9582 100755 --- a/packaging/csapi-nui.spec +++ b/packaging/csapi-nui.spec @@ -1,6 +1,6 @@ Name: csapi-nui Summary: dali-NUI -Version: 0.2.37 +Version: 0.2.38 Release: 1 Group: Development/Libraries License: Apache-2.0 and BSD-3-Clause and MIT diff --git a/src/Tizen.NUI/Tizen.NUI.csproj b/src/Tizen.NUI/Tizen.NUI.csproj index d6cbe22..244d3f7 100755 --- a/src/Tizen.NUI/Tizen.NUI.csproj +++ b/src/Tizen.NUI/Tizen.NUI.csproj @@ -45,19 +45,14 @@ - - - - - - + @@ -74,7 +69,9 @@ + + @@ -105,7 +102,6 @@ - @@ -118,9 +114,7 @@ - - - + @@ -142,7 +136,6 @@ - @@ -150,6 +143,7 @@ + @@ -167,8 +161,9 @@ + - + @@ -177,6 +172,7 @@ + @@ -191,7 +187,6 @@ - @@ -201,6 +196,8 @@ + + @@ -267,6 +264,7 @@ + @@ -286,22 +284,22 @@ + + + + - - + - - - @@ -328,9 +326,7 @@ - - @@ -343,14 +339,9 @@ - - - - - diff --git a/src/Tizen.NUI/src/internal/AccessibilityActionSignal.cs b/src/Tizen.NUI/src/internal/AccessibilityActionSignal.cs index 38fd528..55652bd 100755 --- a/src/Tizen.NUI/src/internal/AccessibilityActionSignal.cs +++ b/src/Tizen.NUI/src/internal/AccessibilityActionSignal.cs @@ -28,7 +28,7 @@ internal class AccessibilityActionSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/AccessibilityFocusOvershotSignal.cs b/src/Tizen.NUI/src/internal/AccessibilityFocusOvershotSignal.cs index 7571e6b..d42b2eb 100755 --- a/src/Tizen.NUI/src/internal/AccessibilityFocusOvershotSignal.cs +++ b/src/Tizen.NUI/src/internal/AccessibilityFocusOvershotSignal.cs @@ -9,8 +9,8 @@ //------------------------------------------------------------------------------ namespace Tizen.NUI { - -internal class AccessibilityFocusOvershotSignal : global::System.IDisposable { + using Tizen.NUI.BaseComponents; + internal class AccessibilityFocusOvershotSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; @@ -28,7 +28,7 @@ internal class AccessibilityFocusOvershotSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -74,8 +74,8 @@ System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForD } } - public void Emit(Actor arg1, AccessibilityManager.FocusOvershotDirection arg2) { - NDalicPINVOKE.AccessibilityFocusOvershotSignal_Emit(swigCPtr, Actor.getCPtr(arg1), (int)arg2); + public void Emit(View arg1, AccessibilityManager.FocusOvershotDirection arg2) { + NDalicPINVOKE.AccessibilityFocusOvershotSignal_Emit(swigCPtr, View.getCPtr(arg1), (int)arg2); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/src/Tizen.NUI/src/internal/AccessibilityManager.cs b/src/Tizen.NUI/src/internal/AccessibilityManager.cs index 9b95020..076d336 100755 --- a/src/Tizen.NUI/src/internal/AccessibilityManager.cs +++ b/src/Tizen.NUI/src/internal/AccessibilityManager.cs @@ -12,6 +12,7 @@ namespace Tizen.NUI { using System; using System.Runtime.InteropServices; + using Tizen.NUI.BaseComponents; internal class AccessibilityManager : BaseHandle { private global::System.Runtime.InteropServices.HandleRef swigCPtr; @@ -25,7 +26,7 @@ internal class AccessibilityManager : BaseHandle { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -43,9 +44,6 @@ internal class AccessibilityManager : BaseHandle { } } - - - /** * @brief Event arguments that passed via StatusChanged signal * @@ -635,52 +633,52 @@ internal class AccessibilityManager : BaseHandle { */ public class FocusChangedEventArgs : EventArgs { - private Actor _actorCurrent; - private Actor _actorNext; + private View _viewCurrent; + private View _viewNext; - public Actor ActorCurrent - { + public View ViewCurrent + { get { - return _actorCurrent; + return _viewCurrent; } set { - _actorCurrent = value; + _viewCurrent = value; } } - public Actor ActorNext - { + public View ViewNext + { get { - return _actorNext; + return _viewNext; } set { - _actorNext = value; + _viewNext = value; } } } /** - * @brief Event arguments that passed via FocusedActorActivated signal + * @brief Event arguments that passed via FocusedViewActivated signal * */ - public class FocusedActorActivatedEventArgs : EventArgs + public class FocusedViewActivatedEventArgs : EventArgs { - private Actor _actor; + private View _view; - public Actor Actor - { + public View View + { get { - return _actor; + return _view; } set { - _actor = value; + _view = value; } } } @@ -691,18 +689,18 @@ internal class AccessibilityManager : BaseHandle { */ public class FocusOvershotEventArgs : EventArgs { - private Actor _currentFocusedActor; + private View _currentFocusedView; private AccessibilityManager.FocusOvershotDirection _focusOvershotDirection; - public Actor CurrentFocusedActor - { + public View CurrentFocusedView + { get { - return _currentFocusedActor; + return _currentFocusedView; } set { - _currentFocusedActor = value; + _currentFocusedView = value; } } @@ -859,17 +857,17 @@ internal class AccessibilityManager : BaseHandle { */ [UnmanagedFunctionPointer(CallingConvention.StdCall)] - private delegate void FocusChangedEventCallbackDelegate(IntPtr actor1, IntPtr actor2); + private delegate void FocusChangedEventCallbackDelegate(IntPtr view1, IntPtr view2); private DaliEventHandler _accessibilityManagerFocusChangedEventHandler; private FocusChangedEventCallbackDelegate _accessibilityManagerFocusChangedEventCallbackDelegate; [UnmanagedFunctionPointer(CallingConvention.StdCall)] - private delegate void FocusedActorActivatedEventCallbackDelegate(IntPtr actor); - private DaliEventHandler _accessibilityManagerFocusedActorActivatedEventHandler; - private FocusedActorActivatedEventCallbackDelegate _accessibilityManagerFocusedActorActivatedEventCallbackDelegate; + private delegate void FocusedViewActivatedEventCallbackDelegate(IntPtr view); + private DaliEventHandler _accessibilityManagerFocusedViewActivatedEventHandler; + private FocusedViewActivatedEventCallbackDelegate _accessibilityManagerFocusedViewActivatedEventCallbackDelegate; [UnmanagedFunctionPointer(CallingConvention.StdCall)] - private delegate void FocusOvershotEventCallbackDelegate(IntPtr currentFocusedActor, AccessibilityManager.FocusOvershotDirection direction); + private delegate void FocusOvershotEventCallbackDelegate(IntPtr currentFocusedView, AccessibilityManager.FocusOvershotDirection direction); private DaliEventHandler _accessibilityManagerFocusOvershotEventHandler; private FocusOvershotEventCallbackDelegate _accessibilityManagerFocusOvershotEventCallbackDelegate; @@ -2182,13 +2180,13 @@ internal class AccessibilityManager : BaseHandle { } // Callback for AccessibilityManager FocusChangedSignal - private void OnFocusChanged(IntPtr actor1, IntPtr actor2) + private void OnFocusChanged(IntPtr view1, IntPtr view2) { FocusChangedEventArgs e = new FocusChangedEventArgs(); // Populate all members of "e" (FocusChangedEventArgs) with real data - e.ActorCurrent = Actor.GetActorFromPtr(actor1); - e.ActorNext = Actor.GetActorFromPtr(actor2); + e.ViewCurrent = View.GetViewFromPtr(view1); + e.ViewNext = View.GetViewFromPtr(view2); if (_accessibilityManagerFocusChangedEventHandler != null) { @@ -2197,19 +2195,19 @@ internal class AccessibilityManager : BaseHandle { } } - public event DaliEventHandler FocusedActorActivated + public event DaliEventHandler FocusedViewActivated { add { lock(this) { // Restricted to only one listener - if (_accessibilityManagerFocusedActorActivatedEventHandler == null) + if (_accessibilityManagerFocusedViewActivatedEventHandler == null) { - _accessibilityManagerFocusedActorActivatedEventHandler += value; + _accessibilityManagerFocusedViewActivatedEventHandler += value; - _accessibilityManagerFocusedActorActivatedEventCallbackDelegate = new FocusedActorActivatedEventCallbackDelegate(OnFocusedActorActivated); - this.FocusedActorActivatedSignal().Connect(_accessibilityManagerFocusedActorActivatedEventCallbackDelegate); + _accessibilityManagerFocusedViewActivatedEventCallbackDelegate = new FocusedViewActivatedEventCallbackDelegate(OnFocusedViewActivated); + this.FocusedViewActivatedSignal().Connect(_accessibilityManagerFocusedViewActivatedEventCallbackDelegate); } } } @@ -2218,28 +2216,28 @@ internal class AccessibilityManager : BaseHandle { { lock(this) { - if (_accessibilityManagerFocusedActorActivatedEventHandler != null) + if (_accessibilityManagerFocusedViewActivatedEventHandler != null) { - this.FocusedActorActivatedSignal().Disconnect(_accessibilityManagerFocusedActorActivatedEventCallbackDelegate); + this.FocusedViewActivatedSignal().Disconnect(_accessibilityManagerFocusedViewActivatedEventCallbackDelegate); } - _accessibilityManagerFocusedActorActivatedEventHandler -= value; + _accessibilityManagerFocusedViewActivatedEventHandler -= value; } } } - // Callback for AccessibilityManager FocusedActorActivatedSignal - private void OnFocusedActorActivated(IntPtr actor) + // Callback for AccessibilityManager FocusedViewActivatedSignal + private void OnFocusedViewActivated(IntPtr view) { - FocusedActorActivatedEventArgs e = new FocusedActorActivatedEventArgs(); + FocusedViewActivatedEventArgs e = new FocusedViewActivatedEventArgs(); - // Populate all members of "e" (FocusedActorActivatedEventArgs) with real data - e.Actor = Actor.GetActorFromPtr(actor); + // Populate all members of "e" (FocusedViewActivatedEventArgs) with real data + e.View = View.GetViewFromPtr(view); - if (_accessibilityManagerFocusedActorActivatedEventHandler != null) + if (_accessibilityManagerFocusedViewActivatedEventHandler != null) { //here we send all data to user event handlers - _accessibilityManagerFocusedActorActivatedEventHandler(this, e); + _accessibilityManagerFocusedViewActivatedEventHandler(this, e); } } @@ -2276,12 +2274,12 @@ internal class AccessibilityManager : BaseHandle { } // Callback for AccessibilityManager FocusOvershotSignal - private void OnFocusOvershot(IntPtr currentFocusedActor, AccessibilityManager.FocusOvershotDirection direction) + private void OnFocusOvershot(IntPtr currentFocusedView, AccessibilityManager.FocusOvershotDirection direction) { FocusOvershotEventArgs e = new FocusOvershotEventArgs(); // Populate all members of "e" (FocusOvershotEventArgs) with real data - e.CurrentFocusedActor = Actor.GetActorFromPtr(currentFocusedActor); + e.CurrentFocusedView = View.GetViewFromPtr(currentFocusedView); e.FocusOvershotDirection = direction; if (_accessibilityManagerFocusOvershotEventHandler != null) @@ -2298,7 +2296,7 @@ internal class AccessibilityManager : BaseHandle { return ret; } - + public AccessibilityManager() : this(NDalicPINVOKE.new_AccessibilityManager(), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -2309,24 +2307,24 @@ internal class AccessibilityManager : BaseHandle { return ret; } - public void SetAccessibilityAttribute(Actor actor, AccessibilityManager.AccessibilityAttribute type, string text) { - NDalicPINVOKE.AccessibilityManager_SetAccessibilityAttribute(swigCPtr, Actor.getCPtr(actor), (int)type, text); + public void SetAccessibilityAttribute(View view, AccessibilityManager.AccessibilityAttribute type, string text) { + NDalicPINVOKE.AccessibilityManager_SetAccessibilityAttribute(swigCPtr, View.getCPtr(view), (int)type, text); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public string GetAccessibilityAttribute(Actor actor, AccessibilityManager.AccessibilityAttribute type) { - string ret = NDalicPINVOKE.AccessibilityManager_GetAccessibilityAttribute(swigCPtr, Actor.getCPtr(actor), (int)type); + public string GetAccessibilityAttribute(View view, AccessibilityManager.AccessibilityAttribute type) { + string ret = NDalicPINVOKE.AccessibilityManager_GetAccessibilityAttribute(swigCPtr, View.getCPtr(view), (int)type); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public void SetFocusOrder(Actor actor, uint order) { - NDalicPINVOKE.AccessibilityManager_SetFocusOrder(swigCPtr, Actor.getCPtr(actor), order); + public void SetFocusOrder(View view, uint order) { + NDalicPINVOKE.AccessibilityManager_SetFocusOrder(swigCPtr, View.getCPtr(view), order); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public uint GetFocusOrder(Actor actor) { - uint ret = NDalicPINVOKE.AccessibilityManager_GetFocusOrder(swigCPtr, Actor.getCPtr(actor)); + public uint GetFocusOrder(View view) { + uint ret = NDalicPINVOKE.AccessibilityManager_GetFocusOrder(swigCPtr, View.getCPtr(view)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } @@ -2337,26 +2335,26 @@ internal class AccessibilityManager : BaseHandle { return ret; } - public Actor GetActorByFocusOrder(uint order) { - Actor ret = new Actor(NDalicPINVOKE.AccessibilityManager_GetActorByFocusOrder(swigCPtr, order), true); + public View GetViewByFocusOrder(uint order) { + View ret = new View(NDalicPINVOKE.AccessibilityManager_GetActorByFocusOrder(swigCPtr, order), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public bool SetCurrentFocusActor(Actor actor) { - bool ret = NDalicPINVOKE.AccessibilityManager_SetCurrentFocusActor(swigCPtr, Actor.getCPtr(actor)); + public bool SetCurrentFocusView(View view) { + bool ret = NDalicPINVOKE.AccessibilityManager_SetCurrentFocusActor(swigCPtr, View.getCPtr(view)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Actor GetCurrentFocusActor() { - Actor ret = new Actor(NDalicPINVOKE.AccessibilityManager_GetCurrentFocusActor(swigCPtr), true); + public View GetCurrentFocusView() { + View ret = new View(NDalicPINVOKE.AccessibilityManager_GetCurrentFocusActor(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Actor GetCurrentFocusGroup() { - Actor ret = new Actor(NDalicPINVOKE.AccessibilityManager_GetCurrentFocusGroup(swigCPtr), true); + public View GetCurrentFocusGroup() { + View ret = new View(NDalicPINVOKE.AccessibilityManager_GetCurrentFocusGroup(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } @@ -2389,13 +2387,13 @@ internal class AccessibilityManager : BaseHandle { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void SetFocusGroup(Actor actor, bool isFocusGroup) { - NDalicPINVOKE.AccessibilityManager_SetFocusGroup(swigCPtr, Actor.getCPtr(actor), isFocusGroup); + public void SetFocusGroup(View view, bool isFocusGroup) { + NDalicPINVOKE.AccessibilityManager_SetFocusGroup(swigCPtr, View.getCPtr(view), isFocusGroup); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public bool IsFocusGroup(Actor actor) { - bool ret = NDalicPINVOKE.AccessibilityManager_IsFocusGroup(swigCPtr, Actor.getCPtr(actor)); + public bool IsFocusGroup(View view) { + bool ret = NDalicPINVOKE.AccessibilityManager_IsFocusGroup(swigCPtr, View.getCPtr(view)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } @@ -2422,19 +2420,19 @@ internal class AccessibilityManager : BaseHandle { return ret; } - public void SetFocusIndicatorActor(Actor indicator) { - NDalicPINVOKE.AccessibilityManager_SetFocusIndicatorActor(swigCPtr, Actor.getCPtr(indicator)); + public void SetFocusIndicatorView(View indicator) { + NDalicPINVOKE.AccessibilityManager_SetFocusIndicatorActor(swigCPtr, View.getCPtr(indicator)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Actor GetFocusIndicatorActor() { - Actor ret = new Actor(NDalicPINVOKE.AccessibilityManager_GetFocusIndicatorActor(swigCPtr), true); + public View GetFocusIndicatorView() { + View ret = new View(NDalicPINVOKE.AccessibilityManager_GetFocusIndicatorActor(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Actor GetFocusGroup(Actor actor) { - Actor ret = new Actor(NDalicPINVOKE.AccessibilityManager_GetFocusGroup(swigCPtr, Actor.getCPtr(actor)), true); + public View GetFocusGroup(View view) { + View ret = new View(NDalicPINVOKE.AccessibilityManager_GetFocusGroup(swigCPtr, View.getCPtr(view)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } @@ -2457,8 +2455,8 @@ internal class AccessibilityManager : BaseHandle { return ret; } - public ActorSignal FocusedActorActivatedSignal() { - ActorSignal ret = new ActorSignal(NDalicPINVOKE.AccessibilityManager_FocusedActorActivatedSignal(swigCPtr), false); + public ViewSignal FocusedViewActivatedSignal() { + ViewSignal ret = new ViewSignal(NDalicPINVOKE.AccessibilityManager_FocusedActorActivatedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } diff --git a/src/Tizen.NUI/src/internal/Alignment.cs b/src/Tizen.NUI/src/internal/Alignment.cs index c825d3a..7b8e6c4 100755 --- a/src/Tizen.NUI/src/internal/Alignment.cs +++ b/src/Tizen.NUI/src/internal/Alignment.cs @@ -40,7 +40,7 @@ internal class Alignment : View { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -73,10 +73,15 @@ internal class Alignment : View { } ~Padding() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock(this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) { if (swigCMemOwn) { diff --git a/src/Tizen.NUI/src/internal/AngleAxis.cs b/src/Tizen.NUI/src/internal/AngleAxis.cs index 46138c6..c8c2d04 100755 --- a/src/Tizen.NUI/src/internal/AngleAxis.cs +++ b/src/Tizen.NUI/src/internal/AngleAxis.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/AngleThresholdPair.cs b/src/Tizen.NUI/src/internal/AngleThresholdPair.cs index 765f824..38165cf 100755 --- a/src/Tizen.NUI/src/internal/AngleThresholdPair.cs +++ b/src/Tizen.NUI/src/internal/AngleThresholdPair.cs @@ -24,10 +24,15 @@ namespace Tizen.NUI { } ~AngleThresholdPair() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock(this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) { if (swigCMemOwn) { diff --git a/src/Tizen.NUI/src/internal/Handle.cs b/src/Tizen.NUI/src/internal/Animatable.cs similarity index 64% rename from src/Tizen.NUI/src/internal/Handle.cs rename to src/Tizen.NUI/src/internal/Animatable.cs index 31e2d0e..2eb0077 100755 --- a/src/Tizen.NUI/src/internal/Handle.cs +++ b/src/Tizen.NUI/src/internal/Animatable.cs @@ -13,33 +13,27 @@ * limitations under the License. * */ -// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts -//------------------------------------------------------------------------------ -// -// -// 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 { - -public class Handle : BaseHandle { + +namespace Tizen.NUI +{ + +public class Animatable : BaseHandle { private global::System.Runtime.InteropServices.HandleRef swigCPtr; - internal Handle(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Handle_SWIGUpcast(cPtr), cMemoryOwn) { + internal Animatable(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Handle_SWIGUpcast(cPtr), cMemoryOwn) { swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); } - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Handle obj) { + internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Animatable obj) { return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; } + ~Animatable() { + DisposeQueue.Instance.Add(this); + } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -58,27 +52,15 @@ public class Handle : BaseHandle { } - public Handle () : this (NDalicPINVOKE.Handle_New(), true) { + public Animatable () : this (NDalicPINVOKE.Handle_New(), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Handle(Handle handle) : this(NDalicPINVOKE.new_Handle__SWIG_1(Handle.getCPtr(handle)), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public Handle Assign(Handle rhs) { - Handle ret = new Handle(NDalicPINVOKE.Handle_Assign(swigCPtr, Handle.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static Handle DownCast(BaseHandle handle) { - Handle ret = new Handle(NDalicPINVOKE.Handle_DownCast(BaseHandle.getCPtr(handle)), true); + public Animatable(Animatable handle) : this(NDalicPINVOKE.new_Handle__SWIG_1(Animatable.getCPtr(handle)), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; } - public bool Supports(Handle.Capability capability) { + public bool Supports(Animatable.Capability capability) { bool ret = NDalicPINVOKE.Handle_Supports(swigCPtr, (int)capability); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -126,9 +108,9 @@ public class Handle : BaseHandle { return ret; } - public void SetProperty(int index, PropertyValue propertyValue) { - NDalicPINVOKE.Handle_SetProperty(swigCPtr, index, PropertyValue.getCPtr(propertyValue)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + public void SetProperty(int index, PropertyValue propertyValue) + { + Tizen.NUI.Object.SetProperty( swigCPtr, index, propertyValue ); } public int RegisterProperty(string name, PropertyValue propertyValue) { @@ -143,37 +125,33 @@ public class Handle : BaseHandle { return ret; } - public PropertyValue GetProperty(int index) { - PropertyValue ret = new PropertyValue(NDalicPINVOKE.Handle_GetProperty(swigCPtr, index), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + public PropertyValue GetProperty(int index) + { + PropertyValue ret = Tizen.NUI.Object.GetProperty( swigCPtr, index ); return ret; } - internal void GetPropertyIndices(VectorInteger indices) - { - NDalicPINVOKE.Handle_GetPropertyIndices(swigCPtr, VectorInteger.getCPtr(indices)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } + internal void GetPropertyIndices(VectorInteger indices) { + NDalicPINVOKE.Handle_GetPropertyIndices(swigCPtr, VectorInteger.getCPtr(indices)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } - internal PropertyNotification AddPropertyNotification(int index, PropertyCondition condition) - { - PropertyNotification ret = new PropertyNotification(NDalicPINVOKE.Handle_AddPropertyNotification__SWIG_0(swigCPtr, index, PropertyCondition.getCPtr(condition)), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } + internal PropertyNotification AddPropertyNotification(int index, PropertyCondition condition) { + PropertyNotification ret = new PropertyNotification(NDalicPINVOKE.Handle_AddPropertyNotification__SWIG_0(swigCPtr, index, PropertyCondition.getCPtr(condition)), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } - internal PropertyNotification AddPropertyNotification(int index, int componentIndex, PropertyCondition condition) - { - PropertyNotification ret = new PropertyNotification(NDalicPINVOKE.Handle_AddPropertyNotification__SWIG_1(swigCPtr, index, componentIndex, PropertyCondition.getCPtr(condition)), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } + internal PropertyNotification AddPropertyNotification(int index, int componentIndex, PropertyCondition condition) { + PropertyNotification ret = new PropertyNotification(NDalicPINVOKE.Handle_AddPropertyNotification__SWIG_1(swigCPtr, index, componentIndex, PropertyCondition.getCPtr(condition)), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } - internal void RemovePropertyNotification(PropertyNotification propertyNotification) - { - NDalicPINVOKE.Handle_RemovePropertyNotification(swigCPtr, PropertyNotification.getCPtr(propertyNotification)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } + internal void RemovePropertyNotification(PropertyNotification propertyNotification) { + NDalicPINVOKE.Handle_RemovePropertyNotification(swigCPtr, PropertyNotification.getCPtr(propertyNotification)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } public void RemovePropertyNotifications() { NDalicPINVOKE.Handle_RemovePropertyNotifications(swigCPtr); diff --git a/src/Tizen.NUI/src/internal/AnimatablePropertyComponentRegistration.cs b/src/Tizen.NUI/src/internal/AnimatablePropertyComponentRegistration.cs index 7fbe27c..02ece7e 100755 --- a/src/Tizen.NUI/src/internal/AnimatablePropertyComponentRegistration.cs +++ b/src/Tizen.NUI/src/internal/AnimatablePropertyComponentRegistration.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/AnimatablePropertyRegistration.cs b/src/Tizen.NUI/src/internal/AnimatablePropertyRegistration.cs index 4e70249..a255152 100755 --- a/src/Tizen.NUI/src/internal/AnimatablePropertyRegistration.cs +++ b/src/Tizen.NUI/src/internal/AnimatablePropertyRegistration.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/AnimationSignal.cs b/src/Tizen.NUI/src/internal/AnimationSignal.cs index 10b205b..4aab716 100755 --- a/src/Tizen.NUI/src/internal/AnimationSignal.cs +++ b/src/Tizen.NUI/src/internal/AnimationSignal.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/Any.cs b/src/Tizen.NUI/src/internal/Any.cs index 11e0c2c..1c07d35 100755 --- a/src/Tizen.NUI/src/internal/Any.cs +++ b/src/Tizen.NUI/src/internal/Any.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -91,10 +91,15 @@ namespace Tizen.NUI { } ~AnyContainerBase() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock(this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) { if (swigCMemOwn) { diff --git a/src/Tizen.NUI/src/internal/Application.cs b/src/Tizen.NUI/src/internal/Application.cs index 058684a..f136a58 100755 --- a/src/Tizen.NUI/src/internal/Application.cs +++ b/src/Tizen.NUI/src/internal/Application.cs @@ -19,10 +19,10 @@ namespace Tizen.NUI { public const int ver1 = 1; public const int ver2 = 2; - public const int ver3 = 37; + public const int ver3 = 38; public const int nuiVer1 = 0; public const int nuiVer2 = 2; - public const int nuiVer3 = 37; + public const int nuiVer3 = 38; public const string nuiRelease = ""; } @@ -323,7 +323,7 @@ namespace Tizen.NUI public override void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; diff --git a/src/Tizen.NUI/src/internal/ApplicationControlSignal.cs b/src/Tizen.NUI/src/internal/ApplicationControlSignal.cs index 6d6ac1a..b4808fa 100755 --- a/src/Tizen.NUI/src/internal/ApplicationControlSignal.cs +++ b/src/Tizen.NUI/src/internal/ApplicationControlSignal.cs @@ -34,7 +34,7 @@ namespace Tizen.NUI public virtual void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; diff --git a/src/Tizen.NUI/src/internal/ApplicationExtensions.cs b/src/Tizen.NUI/src/internal/ApplicationExtensions.cs index e2bcbc6..5eced8d 100755 --- a/src/Tizen.NUI/src/internal/ApplicationExtensions.cs +++ b/src/Tizen.NUI/src/internal/ApplicationExtensions.cs @@ -28,7 +28,7 @@ internal class ApplicationExtensions : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/ApplicationSignal.cs b/src/Tizen.NUI/src/internal/ApplicationSignal.cs index 85afaea..d81c540 100755 --- a/src/Tizen.NUI/src/internal/ApplicationSignal.cs +++ b/src/Tizen.NUI/src/internal/ApplicationSignal.cs @@ -34,7 +34,7 @@ namespace Tizen.NUI public virtual void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; diff --git a/src/Tizen.NUI/src/internal/AsyncImageLoader.cs b/src/Tizen.NUI/src/internal/AsyncImageLoader.cs index e09ab13..1f377a4 100755 --- a/src/Tizen.NUI/src/internal/AsyncImageLoader.cs +++ b/src/Tizen.NUI/src/internal/AsyncImageLoader.cs @@ -38,7 +38,7 @@ namespace Tizen.NUI { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/BaseHandle.cs b/src/Tizen.NUI/src/internal/BaseHandle.cs index 8f77f37..f394ae1 100755 --- a/src/Tizen.NUI/src/internal/BaseHandle.cs +++ b/src/Tizen.NUI/src/internal/BaseHandle.cs @@ -28,7 +28,7 @@ public class BaseHandle : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/BaseObject.cs b/src/Tizen.NUI/src/internal/BaseObject.cs index e877b48..c2beec3 100755 --- a/src/Tizen.NUI/src/internal/BaseObject.cs +++ b/src/Tizen.NUI/src/internal/BaseObject.cs @@ -23,11 +23,6 @@ namespace Tizen.NUI { public override void Dispose() { - if (!Stage.IsInstalled()) { - DisposeQueue.Instance.Add(this); - return; - } - lock(this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) { if (swigCMemOwn) { diff --git a/src/Tizen.NUI/src/internal/BufferImage.cs b/src/Tizen.NUI/src/internal/BufferImage.cs index 401a843..0971310 100755 --- a/src/Tizen.NUI/src/internal/BufferImage.cs +++ b/src/Tizen.NUI/src/internal/BufferImage.cs @@ -37,8 +37,9 @@ namespace Tizen.NUI { return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; } + public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/Builder.cs b/src/Tizen.NUI/src/internal/Builder.cs index c96ece9..37ae1ce 100755 --- a/src/Tizen.NUI/src/internal/Builder.cs +++ b/src/Tizen.NUI/src/internal/Builder.cs @@ -28,6 +28,7 @@ namespace Tizen.NUI { using System; using System.Runtime.InteropServices; + using Tizen.NUI.BaseComponents; public class Builder : BaseHandle { @@ -42,7 +43,7 @@ public class Builder : BaseHandle { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -186,14 +187,14 @@ public class Builder : BaseHandle { return ret; } - public Animation CreateAnimation(string animationName, Actor sourceActor) { - Animation ret = new Animation(NDalicPINVOKE.Builder_CreateAnimation__SWIG_2(swigCPtr, animationName, Actor.getCPtr(sourceActor)), true); + public Animation CreateAnimation(string animationName, View sourceActor) { + Animation ret = new Animation(NDalicPINVOKE.Builder_CreateAnimation__SWIG_2(swigCPtr, animationName, View.getCPtr(sourceActor)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Animation CreateAnimation(string animationName, PropertyMap map, Actor sourceActor) { - Animation ret = new Animation(NDalicPINVOKE.Builder_CreateAnimation__SWIG_3(swigCPtr, animationName, PropertyMap.getCPtr(map), Actor.getCPtr(sourceActor)), true); + public Animation CreateAnimation(string animationName, PropertyMap map, View sourceActor) { + Animation ret = new Animation(NDalicPINVOKE.Builder_CreateAnimation__SWIG_3(swigCPtr, animationName, PropertyMap.getCPtr(map), View.getCPtr(sourceActor)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } @@ -216,25 +217,25 @@ public class Builder : BaseHandle { return ret; } - public bool ApplyStyle(string styleName, Handle handle) { - bool ret = NDalicPINVOKE.Builder_ApplyStyle(swigCPtr, styleName, Handle.getCPtr(handle)); + public bool ApplyStyle(string styleName, Animatable handle) { + bool ret = NDalicPINVOKE.Builder_ApplyStyle(swigCPtr, styleName, Animatable.getCPtr(handle)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public bool ApplyFromJson(Handle handle, string json) { - bool ret = NDalicPINVOKE.Builder_ApplyFromJson(swigCPtr, Handle.getCPtr(handle), json); + public bool ApplyFromJson(Animatable handle, string json) { + bool ret = NDalicPINVOKE.Builder_ApplyFromJson(swigCPtr, Animatable.getCPtr(handle), json); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public void AddActors(Actor toActor) { - NDalicPINVOKE.Builder_AddActors__SWIG_0(swigCPtr, Actor.getCPtr(toActor)); + public void AddViews(View toActor) { + NDalicPINVOKE.Builder_AddActors__SWIG_0(swigCPtr, View.getCPtr(toActor)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void AddActors(string sectionName, Actor toActor) { - NDalicPINVOKE.Builder_AddActors__SWIG_1(swigCPtr, sectionName, Actor.getCPtr(toActor)); + public void AddViews(string sectionName, View toActor) { + NDalicPINVOKE.Builder_AddActors__SWIG_1(swigCPtr, sectionName, View.getCPtr(toActor)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/src/Tizen.NUI/src/public/UIComponents/Button.cs b/src/Tizen.NUI/src/internal/Button.cs similarity index 98% rename from src/Tizen.NUI/src/public/UIComponents/Button.cs rename to src/Tizen.NUI/src/internal/Button.cs index bf5d35e..80976b3 100755 --- a/src/Tizen.NUI/src/public/UIComponents/Button.cs +++ b/src/Tizen.NUI/src/internal/Button.cs @@ -55,7 +55,7 @@ namespace Tizen.NUI.UIComponents /// public override void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; @@ -508,11 +508,16 @@ namespace Tizen.NUI.UIComponents ~Property() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock (this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) @@ -653,9 +658,9 @@ namespace Tizen.NUI.UIComponents return ret; } - internal void SetLabel(Actor label) + internal void SetLabel(View label) { - NDalicPINVOKE.Button_SetLabel(swigCPtr, Actor.getCPtr(label)); + NDalicPINVOKE.Button_SetLabel(swigCPtr, View.getCPtr(label)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -671,16 +676,16 @@ namespace Tizen.NUI.UIComponents if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal Actor GetButtonImage() + internal View GetButtonImage() { - Actor ret = new Actor(NDalicPINVOKE.Button_GetButtonImage(swigCPtr), true); + View ret = new View(NDalicPINVOKE.Button_GetButtonImage(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal Actor GetSelectedImage() + internal View GetSelectedImage() { - Actor ret = new Actor(NDalicPINVOKE.Button_GetSelectedImage(swigCPtr), true); + View ret = new View(NDalicPINVOKE.Button_GetSelectedImage(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } diff --git a/src/Tizen.NUI/src/internal/ButtonSignal.cs b/src/Tizen.NUI/src/internal/ButtonSignal.cs index 886ebaf..ba23fd6 100755 --- a/src/Tizen.NUI/src/internal/ButtonSignal.cs +++ b/src/Tizen.NUI/src/internal/ButtonSignal.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/Camera.cs b/src/Tizen.NUI/src/internal/Camera.cs new file mode 100755 index 0000000..4de8ad3 --- /dev/null +++ b/src/Tizen.NUI/src/internal/Camera.cs @@ -0,0 +1,421 @@ +/** Copyright (c) 2017 Samsung Electronics Co., Ltd. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* 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 +//------------------------------------------------------------------------------ +// +// +// This file was automatically generated by SWIG (http://www.swig.org). +// Version 3.0.10 +// +// Do not make changes to this file unless you know what you are doing--modify +// the SWIG interface file instead. +//------------------------------------------------------------------------------ + +namespace Tizen.NUI { + + public class Camera : Animatable { + private global::System.Runtime.InteropServices.HandleRef swigCPtr; + + internal Camera(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.CameraActor_SWIGUpcast(cPtr), cMemoryOwn) { + swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); + } + + internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Camera obj) { + return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; + } + + ~Camera() { + DisposeQueue.Instance.Add(this); + } + + public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + + lock(this) { + if (swigCPtr.Handle != global::System.IntPtr.Zero) { + if (swigCMemOwn) { + swigCMemOwn = false; + NDalicPINVOKE.delete_CameraActor(swigCPtr); + } + swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); + } + global::System.GC.SuppressFinalize(this); + } + } + + + public class Property : global::System.IDisposable { + private global::System.Runtime.InteropServices.HandleRef swigCPtr; + protected bool swigCMemOwn; + + internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) { + swigCMemOwn = cMemoryOwn; + swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); + } + + internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) { + return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; + } + + ~Property() { + DisposeQueue.Instance.Add(this); + } + + public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + + lock(this) { + if (swigCPtr.Handle != global::System.IntPtr.Zero) { + if (swigCMemOwn) { + swigCMemOwn = false; + NDalicPINVOKE.delete_CameraActor_Property(swigCPtr); + } + swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); + } + global::System.GC.SuppressFinalize(this); + } + } + + public Property() : this(NDalicPINVOKE.new_CameraActor_Property(), true) { + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public static readonly int TYPE = NDalicPINVOKE.CameraActor_Property_TYPE_get(); + public static readonly int PROJECTION_MODE = NDalicPINVOKE.CameraActor_Property_PROJECTION_MODE_get(); + public static readonly int FIELD_OF_VIEW = NDalicPINVOKE.CameraActor_Property_FIELD_OF_VIEW_get(); + public static readonly int ASPECT_RATIO = NDalicPINVOKE.CameraActor_Property_ASPECT_RATIO_get(); + public static readonly int NEAR_PLANE_DISTANCE = NDalicPINVOKE.CameraActor_Property_NEAR_PLANE_DISTANCE_get(); + public static readonly int FAR_PLANE_DISTANCE = NDalicPINVOKE.CameraActor_Property_FAR_PLANE_DISTANCE_get(); + public static readonly int LEFT_PLANE_DISTANCE = NDalicPINVOKE.CameraActor_Property_LEFT_PLANE_DISTANCE_get(); + public static readonly int RIGHT_PLANE_DISTANCE = NDalicPINVOKE.CameraActor_Property_RIGHT_PLANE_DISTANCE_get(); + public static readonly int TOP_PLANE_DISTANCE = NDalicPINVOKE.CameraActor_Property_TOP_PLANE_DISTANCE_get(); + public static readonly int BOTTOM_PLANE_DISTANCE = NDalicPINVOKE.CameraActor_Property_BOTTOM_PLANE_DISTANCE_get(); + public static readonly int TARGET_POSITION = NDalicPINVOKE.CameraActor_Property_TARGET_POSITION_get(); + public static readonly int PROJECTION_MATRIX = NDalicPINVOKE.CameraActor_Property_PROJECTION_MATRIX_get(); + public static readonly int VIEW_MATRIX = NDalicPINVOKE.CameraActor_Property_VIEW_MATRIX_get(); + public static readonly int INVERT_Y_AXIS = NDalicPINVOKE.CameraActor_Property_INVERT_Y_AXIS_get(); + + } + + public Camera () : this (NDalicPINVOKE.CameraActor_New__SWIG_0(), true) { + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + + } + public Camera (Vector2 size) : this (NDalicPINVOKE.CameraActor_New__SWIG_1(Vector2.getCPtr(size)), true) { + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + + } + public new static Camera DownCast(BaseHandle handle) { + Camera ret = new Camera(NDalicPINVOKE.CameraActor_DownCast(BaseHandle.getCPtr(handle)), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public Camera(Camera copy) : this(NDalicPINVOKE.new_CameraActor__SWIG_1(Camera.getCPtr(copy)), true) { + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public Camera Assign(Camera rhs) { + Camera ret = new Camera(NDalicPINVOKE.CameraActor_Assign(swigCPtr, Camera.getCPtr(rhs)), false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public void SetType(CameraType type) { + NDalicPINVOKE.CameraActor_SetType(swigCPtr, (int)type); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public CameraType GetType() { + CameraType ret = (CameraType)NDalicPINVOKE.CameraActor_GetType(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public void SetProjectionMode(ProjectionMode mode) { + NDalicPINVOKE.CameraActor_SetProjectionMode(swigCPtr, (int)mode); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public ProjectionMode GetProjectionMode() { + ProjectionMode ret = (ProjectionMode)NDalicPINVOKE.CameraActor_GetProjectionMode(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public void SetFieldOfView(float fieldOfView) { + NDalicPINVOKE.CameraActor_SetFieldOfView(swigCPtr, fieldOfView); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public float GetFieldOfView() { + float ret = NDalicPINVOKE.CameraActor_GetFieldOfView(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public void SetAspectRatio(float aspectRatio) { + NDalicPINVOKE.CameraActor_SetAspectRatio(swigCPtr, aspectRatio); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public float GetAspectRatio() { + float ret = NDalicPINVOKE.CameraActor_GetAspectRatio(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public void SetNearClippingPlane(float nearClippingPlane) { + NDalicPINVOKE.CameraActor_SetNearClippingPlane(swigCPtr, nearClippingPlane); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public float GetNearClippingPlane() { + float ret = NDalicPINVOKE.CameraActor_GetNearClippingPlane(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public void SetFarClippingPlane(float farClippingPlane) { + NDalicPINVOKE.CameraActor_SetFarClippingPlane(swigCPtr, farClippingPlane); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public float GetFarClippingPlane() { + float ret = NDalicPINVOKE.CameraActor_GetFarClippingPlane(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public void SetTargetPosition(Vector3 targetPosition) { + NDalicPINVOKE.CameraActor_SetTargetPosition(swigCPtr, Vector3.getCPtr(targetPosition)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public Vector3 GetTargetPosition() { + Vector3 ret = new Vector3(NDalicPINVOKE.CameraActor_GetTargetPosition(swigCPtr), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public void SetInvertYAxis(bool invertYAxis) { + NDalicPINVOKE.CameraActor_SetInvertYAxis(swigCPtr, invertYAxis); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public bool GetInvertYAxis() { + bool ret = NDalicPINVOKE.CameraActor_GetInvertYAxis(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public void SetPerspectiveProjection(Vector2 size) { + NDalicPINVOKE.CameraActor_SetPerspectiveProjection(swigCPtr, Vector2.getCPtr(size)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public void SetOrthographicProjection(Vector2 size) { + NDalicPINVOKE.CameraActor_SetOrthographicProjection__SWIG_0(swigCPtr, Vector2.getCPtr(size)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public void SetOrthographicProjection(float left, float right, float top, float bottom, float near, float far) { + NDalicPINVOKE.CameraActor_SetOrthographicProjection__SWIG_1(swigCPtr, left, right, top, bottom, near, far); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public string Type + { + get + { + string temp; + GetProperty( Camera.Property.TYPE).Get( out temp ); + return temp; + } + set + { + SetProperty( Camera.Property.TYPE, new Tizen.NUI.PropertyValue( value ) ); + } + } + public string ProjectionMode + { + get + { + string temp; + GetProperty( Camera.Property.PROJECTION_MODE).Get( out temp ); + return temp; + } + set + { + SetProperty( Camera.Property.PROJECTION_MODE, new Tizen.NUI.PropertyValue( value ) ); + } + } + public float FieldOfView + { + get + { + float temp = 0.0f; + GetProperty( Camera.Property.FIELD_OF_VIEW).Get( ref temp ); + return temp; + } + set + { + SetProperty( Camera.Property.FIELD_OF_VIEW, new Tizen.NUI.PropertyValue( value ) ); + } + } + public float AspectRatio + { + get + { + float temp = 0.0f; + GetProperty( Camera.Property.ASPECT_RATIO).Get( ref temp ); + return temp; + } + set + { + SetProperty( Camera.Property.ASPECT_RATIO, new Tizen.NUI.PropertyValue( value ) ); + } + } + public float NearPlaneDistance + { + get + { + float temp = 0.0f; + GetProperty( Camera.Property.NEAR_PLANE_DISTANCE).Get( ref temp ); + return temp; + } + set + { + SetProperty( Camera.Property.NEAR_PLANE_DISTANCE, new Tizen.NUI.PropertyValue( value ) ); + } + } + public float FarPlaneDistance + { + get + { + float temp = 0.0f; + GetProperty( Camera.Property.FAR_PLANE_DISTANCE).Get( ref temp ); + return temp; + } + set + { + SetProperty( Camera.Property.FAR_PLANE_DISTANCE, new Tizen.NUI.PropertyValue( value ) ); + } + } + public float LeftPlaneDistance + { + get + { + float temp = 0.0f; + GetProperty( Camera.Property.LEFT_PLANE_DISTANCE).Get( ref temp ); + return temp; + } + set + { + SetProperty( Camera.Property.LEFT_PLANE_DISTANCE, new Tizen.NUI.PropertyValue( value ) ); + } + } + public float RightPlaneDistance + { + get + { + float temp = 0.0f; + GetProperty( Camera.Property.RIGHT_PLANE_DISTANCE).Get( ref temp ); + return temp; + } + set + { + SetProperty( Camera.Property.RIGHT_PLANE_DISTANCE, new Tizen.NUI.PropertyValue( value ) ); + } + } + public float TopPlaneDistance + { + get + { + float temp = 0.0f; + GetProperty( Camera.Property.TOP_PLANE_DISTANCE).Get( ref temp ); + return temp; + } + set + { + SetProperty( Camera.Property.TOP_PLANE_DISTANCE, new Tizen.NUI.PropertyValue( value ) ); + } + } + public float BottomPlaneDistance + { + get + { + float temp = 0.0f; + GetProperty( Camera.Property.BOTTOM_PLANE_DISTANCE).Get( ref temp ); + return temp; + } + set + { + SetProperty( Camera.Property.BOTTOM_PLANE_DISTANCE, new Tizen.NUI.PropertyValue( value ) ); + } + } + public Vector3 TargetPosition + { + get + { + Vector3 temp = new Vector3(0.0f,0.0f,0.0f); + GetProperty( Camera.Property.TARGET_POSITION).Get( temp ); + return temp; + } + set + { + SetProperty( Camera.Property.TARGET_POSITION, new Tizen.NUI.PropertyValue( value ) ); + } + } + internal Matrix ProjectionMatrix + { + get + { + Matrix temp = new Matrix(); + GetProperty( Camera.Property.PROJECTION_MATRIX).Get( temp ); + return temp; + } +} internal Matrix ViewMatrix + { + get + { + Matrix temp = new Matrix(); + GetProperty( Camera.Property.VIEW_MATRIX).Get( temp ); + return temp; + } +} public bool InvertYAxis + { + get + { + bool temp = false; + GetProperty( Camera.Property.INVERT_Y_AXIS).Get( ref temp ); + return temp; + } + set + { + SetProperty( Camera.Property.INVERT_Y_AXIS, new Tizen.NUI.PropertyValue( value ) ); + } + } + +} + +} diff --git a/src/Tizen.NUI/src/internal/ChildPropertyRegistration.cs b/src/Tizen.NUI/src/internal/ChildPropertyRegistration.cs index 5cd6c98..ceaea76 100755 --- a/src/Tizen.NUI/src/internal/ChildPropertyRegistration.cs +++ b/src/Tizen.NUI/src/internal/ChildPropertyRegistration.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/ClampState2D.cs b/src/Tizen.NUI/src/internal/ClampState2D.cs index 537ef83..17a48e2 100755 --- a/src/Tizen.NUI/src/internal/ClampState2D.cs +++ b/src/Tizen.NUI/src/internal/ClampState2D.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/ConnectionTracker.cs b/src/Tizen.NUI/src/internal/ConnectionTracker.cs index 3001e10..fe593dd 100755 --- a/src/Tizen.NUI/src/internal/ConnectionTracker.cs +++ b/src/Tizen.NUI/src/internal/ConnectionTracker.cs @@ -22,7 +22,7 @@ namespace Tizen.NUI { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/ConnectionTrackerInterface.cs b/src/Tizen.NUI/src/internal/ConnectionTrackerInterface.cs index 924b6c1..d12ed23 100755 --- a/src/Tizen.NUI/src/internal/ConnectionTrackerInterface.cs +++ b/src/Tizen.NUI/src/internal/ConnectionTrackerInterface.cs @@ -22,7 +22,7 @@ namespace Tizen.NUI { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/ControlKeySignal.cs b/src/Tizen.NUI/src/internal/ControlKeySignal.cs index b35846a..922b438 100755 --- a/src/Tizen.NUI/src/internal/ControlKeySignal.cs +++ b/src/Tizen.NUI/src/internal/ControlKeySignal.cs @@ -30,7 +30,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/CustomActor.cs b/src/Tizen.NUI/src/internal/CustomActor.cs index 0509b25..c2a1902 100755 --- a/src/Tizen.NUI/src/internal/CustomActor.cs +++ b/src/Tizen.NUI/src/internal/CustomActor.cs @@ -10,7 +10,7 @@ namespace Tizen.NUI { -public class CustomActor : Actor { +public class CustomActor : Animatable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal CustomActor(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.CustomActor_SWIGUpcast(cPtr), cMemoryOwn) { @@ -21,8 +21,8 @@ public class CustomActor : Actor { return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; } - public override void Dispose() { - if (!Stage.IsInstalled()) { + public virtual void Dispose() { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -36,7 +36,6 @@ public class CustomActor : Actor { swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); } global::System.GC.SuppressFinalize(this); - base.Dispose(); } } diff --git a/src/Tizen.NUI/src/internal/CustomActorImpl.cs b/src/Tizen.NUI/src/internal/CustomActorImpl.cs index dd1a895..86584df 100755 --- a/src/Tizen.NUI/src/internal/CustomActorImpl.cs +++ b/src/Tizen.NUI/src/internal/CustomActorImpl.cs @@ -9,8 +9,8 @@ //------------------------------------------------------------------------------ namespace Tizen.NUI { - -public class CustomActorImpl : RefObject { + using Tizen.NUI.BaseComponents; + public class CustomActorImpl : RefObject { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal CustomActorImpl(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.CustomActorImpl_SWIGUpcast(cPtr), cMemoryOwn) { @@ -23,11 +23,6 @@ public class CustomActorImpl : RefObject { public override void Dispose() { - if (!Stage.IsInstalled()) { - DisposeQueue.Instance.Add(this); - return; - } - lock(this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) { if (swigCMemOwn) { @@ -57,13 +52,13 @@ public class CustomActorImpl : RefObject { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public virtual void OnChildAdd(Actor child) { - NDalicPINVOKE.CustomActorImpl_OnChildAdd(swigCPtr, Actor.getCPtr(child)); + public virtual void OnChildAdd(View child) { + NDalicPINVOKE.CustomActorImpl_OnChildAdd(swigCPtr, View.getCPtr(child)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public virtual void OnChildRemove(Actor child) { - NDalicPINVOKE.CustomActorImpl_OnChildRemove(swigCPtr, Actor.getCPtr(child)); + public virtual void OnChildRemove(View child) { + NDalicPINVOKE.CustomActorImpl_OnChildRemove(swigCPtr, View.getCPtr(child)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -122,8 +117,8 @@ public class CustomActorImpl : RefObject { return ret; } - public virtual float CalculateChildSize(Actor child, DimensionType dimension) { - float ret = NDalicPINVOKE.CustomActorImpl_CalculateChildSize(swigCPtr, Actor.getCPtr(child), (int)dimension); + public virtual float CalculateChildSize(View child, DimensionType dimension) { + float ret = NDalicPINVOKE.CustomActorImpl_CalculateChildSize(swigCPtr, View.getCPtr(child), (int)dimension); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } diff --git a/src/Tizen.NUI/src/internal/CustomAlgorithmInterface.cs b/src/Tizen.NUI/src/internal/CustomAlgorithmInterface.cs index a33152e..ab7f7ab 100755 --- a/src/Tizen.NUI/src/internal/CustomAlgorithmInterface.cs +++ b/src/Tizen.NUI/src/internal/CustomAlgorithmInterface.cs @@ -35,7 +35,7 @@ internal class CustomAlgorithmInterface : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -51,8 +51,8 @@ internal class CustomAlgorithmInterface : global::System.IDisposable { } } - public virtual Actor GetNextFocusableActor(Actor current, Actor proposed, View.FocusDirection direction) { - Actor ret = new Actor(NDalicPINVOKE.CustomAlgorithmInterface_GetNextFocusableActor(swigCPtr, Actor.getCPtr(current), Actor.getCPtr(proposed), (int)direction), true); + public virtual View GetNextFocusableView(View current, View proposed, View.FocusDirection direction) { + View ret = new View(NDalicPINVOKE.CustomAlgorithmInterface_GetNextFocusableActor(swigCPtr, View.getCPtr(current), View.getCPtr(proposed), (int)direction), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } @@ -63,8 +63,8 @@ internal class CustomAlgorithmInterface : global::System.IDisposable { } private void SwigDirectorConnect() { - if (SwigDerivedClassHasMethod("GetNextFocusableActor", swigMethodTypes0)) - swigDelegate0 = new SwigDelegateCustomAlgorithmInterface_0(SwigDirectorGetNextFocusableActor); + if (SwigDerivedClassHasMethod("GetNextFocusableView", swigMethodTypes0)) + swigDelegate0 = new SwigDelegateCustomAlgorithmInterface_0(SwigDirectorGetNextFocusableView); NDalicPINVOKE.CustomAlgorithmInterface_director_connect(swigCPtr, swigDelegate0); } @@ -82,15 +82,15 @@ internal class CustomAlgorithmInterface : global::System.IDisposable { } #endif - private global::System.IntPtr SwigDirectorGetNextFocusableActor(global::System.IntPtr current, global::System.IntPtr proposed, int direction) { - return Actor.getCPtr(GetNextFocusableActor(new Actor(current, true), new Actor(proposed, true), (View.FocusDirection)direction)).Handle; + private global::System.IntPtr SwigDirectorGetNextFocusableView(global::System.IntPtr current, global::System.IntPtr proposed, int direction) { + return View.getCPtr(GetNextFocusableView(new View(current, true), new View(proposed, true), (View.FocusDirection)direction)).Handle; } public delegate global::System.IntPtr SwigDelegateCustomAlgorithmInterface_0(global::System.IntPtr current, global::System.IntPtr proposed, int direction); private SwigDelegateCustomAlgorithmInterface_0 swigDelegate0; - private static global::System.Type[] swigMethodTypes0 = new global::System.Type[] { typeof(Actor), typeof(Actor), typeof(View.FocusDirection) }; + private static global::System.Type[] swigMethodTypes0 = new global::System.Type[] { typeof(View), typeof(View), typeof(View.FocusDirection) }; } } diff --git a/src/Tizen.NUI/src/internal/DaliException.cs b/src/Tizen.NUI/src/internal/DaliException.cs index 92608d9..60fc1d4 100755 --- a/src/Tizen.NUI/src/internal/DaliException.cs +++ b/src/Tizen.NUI/src/internal/DaliException.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/DefaultRuler.cs b/src/Tizen.NUI/src/internal/DefaultRuler.cs index 2ead28e..df4c6ff 100755 --- a/src/Tizen.NUI/src/internal/DefaultRuler.cs +++ b/src/Tizen.NUI/src/internal/DefaultRuler.cs @@ -23,7 +23,7 @@ namespace Tizen.NUI { public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/DisposeQueue.cs b/src/Tizen.NUI/src/internal/DisposeQueue.cs index 64bb3ab..521076e 100755 --- a/src/Tizen.NUI/src/internal/DisposeQueue.cs +++ b/src/Tizen.NUI/src/internal/DisposeQueue.cs @@ -17,7 +17,7 @@ namespace Tizen.NUI { private static readonly DisposeQueue _disposableQueue = new DisposeQueue(); private List _disposables = new List(); - private Object _listLock = new object(); + private System.Object _listLock = new object(); private EventThreadCallback _eventThreadCallback; private EventThreadCallback.CallbackDelegate _disposeQueueProcessDisposablesDelegate; diff --git a/src/Tizen.NUI/src/internal/DragAndDropDetector.cs b/src/Tizen.NUI/src/internal/DragAndDropDetector.cs index cbccf4d..2d87f9c 100755 --- a/src/Tizen.NUI/src/internal/DragAndDropDetector.cs +++ b/src/Tizen.NUI/src/internal/DragAndDropDetector.cs @@ -22,7 +22,7 @@ namespace Tizen.NUI { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/EncodedBufferImage.cs b/src/Tizen.NUI/src/internal/EncodedBufferImage.cs index 4d80189..49be04f 100755 --- a/src/Tizen.NUI/src/internal/EncodedBufferImage.cs +++ b/src/Tizen.NUI/src/internal/EncodedBufferImage.cs @@ -38,7 +38,7 @@ namespace Tizen.NUI { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/EventThreadCallback.cs b/src/Tizen.NUI/src/internal/EventThreadCallback.cs index 6ee750e..15e18ab 100755 --- a/src/Tizen.NUI/src/internal/EventThreadCallback.cs +++ b/src/Tizen.NUI/src/internal/EventThreadCallback.cs @@ -42,7 +42,7 @@ namespace Tizen.NUI public virtual void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; diff --git a/src/Tizen.NUI/src/internal/FittingModeType.cs b/src/Tizen.NUI/src/internal/FittingModeType.cs deleted file mode 100755 index 3f9cc75..0000000 --- a/src/Tizen.NUI/src/internal/FittingModeType.cs +++ /dev/null @@ -1,20 +0,0 @@ -//------------------------------------------------------------------------------ -// -// -// 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 { -/* moved to VisualMaps.cs -public enum FittingModeType { - SHRINK_TO_FIT, - SCALE_TO_FILL, - FIT_WIDTH, - FIT_HEIGHT -} -*/ -} diff --git a/src/Tizen.NUI/src/internal/FixedRuler.cs b/src/Tizen.NUI/src/internal/FixedRuler.cs index e34869f..cdadc72 100755 --- a/src/Tizen.NUI/src/internal/FixedRuler.cs +++ b/src/Tizen.NUI/src/internal/FixedRuler.cs @@ -22,7 +22,7 @@ namespace Tizen.NUI { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/FloatSignal.cs b/src/Tizen.NUI/src/internal/FloatSignal.cs index aecd9c5..9250cbe 100755 --- a/src/Tizen.NUI/src/internal/FloatSignal.cs +++ b/src/Tizen.NUI/src/internal/FloatSignal.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/FocusChangedSignal.cs b/src/Tizen.NUI/src/internal/FocusChangedSignal.cs index e0fb2f6..2999be4 100755 --- a/src/Tizen.NUI/src/internal/FocusChangedSignal.cs +++ b/src/Tizen.NUI/src/internal/FocusChangedSignal.cs @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ namespace Tizen.NUI { - + using Tizen.NUI.BaseComponents; internal class FocusChangedSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -74,8 +74,8 @@ System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForD } } - public void Emit(Actor arg1, Actor arg2) { - NDalicPINVOKE.FocusChangedSignal_Emit(swigCPtr, Actor.getCPtr(arg1), Actor.getCPtr(arg2)); + public void Emit(View arg1, View arg2) { + NDalicPINVOKE.FocusChangedSignal_Emit(swigCPtr, View.getCPtr(arg1), View.getCPtr(arg2)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/src/Tizen.NUI/src/internal/FocusGroupChangedSignal.cs b/src/Tizen.NUI/src/internal/FocusGroupChangedSignal.cs index 201cd21..5c75f02 100755 --- a/src/Tizen.NUI/src/internal/FocusGroupChangedSignal.cs +++ b/src/Tizen.NUI/src/internal/FocusGroupChangedSignal.cs @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ namespace Tizen.NUI { - + using Tizen.NUI.BaseComponents; internal class FocusGroupChangedSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -74,8 +74,8 @@ System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForD } } - public void Emit(Actor arg1, bool arg2) { - NDalicPINVOKE.FocusGroupChangedSignal_Emit(swigCPtr, Actor.getCPtr(arg1), arg2); + public void Emit(View arg1, bool arg2) { + NDalicPINVOKE.FocusGroupChangedSignal_Emit(swigCPtr, View.getCPtr(arg1), arg2); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/src/Tizen.NUI/src/internal/FrameBuffer.cs b/src/Tizen.NUI/src/internal/FrameBuffer.cs index 4bc12c5..7a8cbd0 100755 --- a/src/Tizen.NUI/src/internal/FrameBuffer.cs +++ b/src/Tizen.NUI/src/internal/FrameBuffer.cs @@ -38,7 +38,7 @@ namespace Tizen.NUI { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -71,10 +71,15 @@ namespace Tizen.NUI { } ~Attachment() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock(this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) { if (swigCMemOwn) { diff --git a/src/Tizen.NUI/src/internal/FrameBufferImage.cs b/src/Tizen.NUI/src/internal/FrameBufferImage.cs index 4eaf6c6..dfb6178 100755 --- a/src/Tizen.NUI/src/internal/FrameBufferImage.cs +++ b/src/Tizen.NUI/src/internal/FrameBufferImage.cs @@ -38,7 +38,7 @@ namespace Tizen.NUI { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/GaussianBlurView.cs b/src/Tizen.NUI/src/internal/GaussianBlurView.cs index e1133a9..cf11032 100755 --- a/src/Tizen.NUI/src/internal/GaussianBlurView.cs +++ b/src/Tizen.NUI/src/internal/GaussianBlurView.cs @@ -44,7 +44,7 @@ using System.Runtime.InteropServices; } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -168,13 +168,13 @@ public class FinishedEventArgs : EventArgs return ret; } - public new void Add(Actor child) { - NDalicPINVOKE.GaussianBlurView_Add(swigCPtr, Actor.getCPtr(child)); + public new void Add(View child) { + NDalicPINVOKE.GaussianBlurView_Add(swigCPtr, View.getCPtr(child)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public new void Remove(Actor child) { - NDalicPINVOKE.GaussianBlurView_Remove(swigCPtr, Actor.getCPtr(child)); + public new void Remove(View child) { + NDalicPINVOKE.GaussianBlurView_Remove(swigCPtr, View.getCPtr(child)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/src/Tizen.NUI/src/internal/GaussianBlurViewSignal.cs b/src/Tizen.NUI/src/internal/GaussianBlurViewSignal.cs index be5732d..eab9881 100755 --- a/src/Tizen.NUI/src/internal/GaussianBlurViewSignal.cs +++ b/src/Tizen.NUI/src/internal/GaussianBlurViewSignal.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/Geometry.cs b/src/Tizen.NUI/src/internal/Geometry.cs index 907442a..6f1e427 100755 --- a/src/Tizen.NUI/src/internal/Geometry.cs +++ b/src/Tizen.NUI/src/internal/Geometry.cs @@ -38,7 +38,7 @@ namespace Tizen.NUI { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/GestureDetector.cs b/src/Tizen.NUI/src/internal/GestureDetector.cs index 8ff1337..9ce4627 100755 --- a/src/Tizen.NUI/src/internal/GestureDetector.cs +++ b/src/Tizen.NUI/src/internal/GestureDetector.cs @@ -9,8 +9,8 @@ //------------------------------------------------------------------------------ namespace Tizen.NUI { - -public class GestureDetector : Handle { + using Tizen.NUI.BaseComponents; + public class GestureDetector : BaseHandle { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal GestureDetector(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.GestureDetector_SWIGUpcast(cPtr), cMemoryOwn) { @@ -22,7 +22,7 @@ public class GestureDetector : Handle { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -61,13 +61,13 @@ public class GestureDetector : Handle { return ret; } - public void Attach(Actor actor) { - NDalicPINVOKE.GestureDetector_Attach(swigCPtr, Actor.getCPtr(actor)); + public void Attach(View view) { + NDalicPINVOKE.GestureDetector_Attach(swigCPtr, View.getCPtr(view)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void Detach(Actor actor) { - NDalicPINVOKE.GestureDetector_Detach(swigCPtr, Actor.getCPtr(actor)); + public void Detach(View view) { + NDalicPINVOKE.GestureDetector_Detach(swigCPtr, View.getCPtr(view)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -82,8 +82,8 @@ public class GestureDetector : Handle { return ret; } - public Actor GetAttachedActor(uint index) { - Actor ret = new Actor(NDalicPINVOKE.GestureDetector_GetAttachedActor(swigCPtr, index), true); + public View GetAttachedActor(uint index) { + View ret = new View(NDalicPINVOKE.GestureDetector_GetAttachedActor(swigCPtr, index), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } diff --git a/src/Tizen.NUI/src/internal/GradientVisualSpreadMethodType.cs b/src/Tizen.NUI/src/internal/GradientVisualSpreadMethodType.cs deleted file mode 100755 index e359f83..0000000 --- a/src/Tizen.NUI/src/internal/GradientVisualSpreadMethodType.cs +++ /dev/null @@ -1,19 +0,0 @@ -//------------------------------------------------------------------------------ -// -// -// 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 { -/* moved to VisualMaps.cs - internal enum GradientVisualSpreadMethodType { - PAD, - REFLECT, - REPEAT -} -*/ -} diff --git a/src/Tizen.NUI/src/internal/GradientVisualUnitsType.cs b/src/Tizen.NUI/src/internal/GradientVisualUnitsType.cs deleted file mode 100755 index 46ae1a8..0000000 --- a/src/Tizen.NUI/src/internal/GradientVisualUnitsType.cs +++ /dev/null @@ -1,18 +0,0 @@ -//------------------------------------------------------------------------------ -// -// -// 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 { -/* moved to VisualMap.cs - internal enum GradientVisualUnitsType { - OBJECT_BOUNDING_BOX, - USER_SPACE -} -*/ -} diff --git a/src/Tizen.NUI/src/internal/ActorHoverSignal.cs b/src/Tizen.NUI/src/internal/HoverSignal.cs similarity index 85% rename from src/Tizen.NUI/src/internal/ActorHoverSignal.cs rename to src/Tizen.NUI/src/internal/HoverSignal.cs index d5091a3..8be4e0c 100755 --- a/src/Tizen.NUI/src/internal/ActorHoverSignal.cs +++ b/src/Tizen.NUI/src/internal/HoverSignal.cs @@ -2,33 +2,34 @@ // // // This file was automatically generated by SWIG (http://www.swig.org). -// Version 3.0.9 +// Version 3.0.10 // // Do not make changes to this file unless you know what you are doing--modify // the SWIG interface file instead. //------------------------------------------------------------------------------ namespace Tizen.NUI { + using Tizen.NUI.BaseComponents; -internal class ActorHoverSignal : global::System.IDisposable { +internal class HoverSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; - internal ActorHoverSignal(global::System.IntPtr cPtr, bool cMemoryOwn) { + internal HoverSignal(global::System.IntPtr cPtr, bool cMemoryOwn) { swigCMemOwn = cMemoryOwn; swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); } - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ActorHoverSignal obj) { + internal static global::System.Runtime.InteropServices.HandleRef getCPtr(HoverSignal obj) { return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; } - ~ActorHoverSignal() { + ~HoverSignal() { DisposeQueue.Instance.Add(this); } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -74,13 +75,13 @@ System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForD } } - public bool Emit(Actor arg1, Hover arg2) { - bool ret = NDalicPINVOKE.ActorHoverSignal_Emit(swigCPtr, Actor.getCPtr(arg1), Hover.getCPtr(arg2)); + public bool Emit(View arg1, Hover arg2) { + bool ret = NDalicPINVOKE.ActorHoverSignal_Emit(swigCPtr, View.getCPtr(arg1), Hover.getCPtr(arg2)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public ActorHoverSignal() : this(NDalicPINVOKE.new_ActorHoverSignal(), true) { + public HoverSignal() : this(NDalicPINVOKE.new_ActorHoverSignal(), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/src/Tizen.NUI/src/internal/Image.cs b/src/Tizen.NUI/src/internal/Image.cs index 097aab2..d1001c6 100755 --- a/src/Tizen.NUI/src/internal/Image.cs +++ b/src/Tizen.NUI/src/internal/Image.cs @@ -26,7 +26,7 @@ using System.Runtime.InteropServices; } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/ImageSignal.cs b/src/Tizen.NUI/src/internal/ImageSignal.cs index 57228d4..b9050ed 100755 --- a/src/Tizen.NUI/src/internal/ImageSignal.cs +++ b/src/Tizen.NUI/src/internal/ImageSignal.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/ImfManager.cs b/src/Tizen.NUI/src/internal/ImfManager.cs index bb84fa5..b09c830 100755 --- a/src/Tizen.NUI/src/internal/ImfManager.cs +++ b/src/Tizen.NUI/src/internal/ImfManager.cs @@ -69,11 +69,16 @@ namespace Tizen.NUI ~ImfEventData() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock (this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) @@ -179,11 +184,16 @@ namespace Tizen.NUI ~ImfCallbackData() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock (this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) @@ -836,11 +846,16 @@ namespace Tizen.NUI ~ActivatedSignalType() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock (this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) @@ -920,11 +935,16 @@ namespace Tizen.NUI ~ImfEventSignalType() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock (this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) @@ -1004,11 +1024,16 @@ namespace Tizen.NUI ~StatusSignalType() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock (this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) @@ -1088,11 +1113,16 @@ namespace Tizen.NUI ~ImfVoidSignalType() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock (this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) diff --git a/src/Tizen.NUI/src/internal/Item.cs b/src/Tizen.NUI/src/internal/Item.cs index 623cff5..5f15536 100755 --- a/src/Tizen.NUI/src/internal/Item.cs +++ b/src/Tizen.NUI/src/internal/Item.cs @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ namespace Tizen.NUI { - + using Tizen.NUI.BaseComponents; public class Item : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -49,7 +49,7 @@ namespace Tizen.NUI { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Item(uint t, Actor u) : this(NDalicPINVOKE.new_Item__SWIG_1(t, Actor.getCPtr(u)), true) { + public Item(uint t, View u) : this(NDalicPINVOKE.new_Item__SWIG_1(t, View.getCPtr(u)), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -69,14 +69,14 @@ namespace Tizen.NUI { } } - public Actor second { + public View second { set { - NDalicPINVOKE.Item_second_set(swigCPtr, Actor.getCPtr(value)); + NDalicPINVOKE.Item_second_set(swigCPtr, View.getCPtr(value)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } get { global::System.IntPtr cPtr = NDalicPINVOKE.Item_second_get(swigCPtr); - Actor ret = (cPtr == global::System.IntPtr.Zero) ? null : new Actor(cPtr, false); + View ret = (cPtr == global::System.IntPtr.Zero) ? null : new View(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } diff --git a/src/Tizen.NUI/src/internal/ItemContainer.cs b/src/Tizen.NUI/src/internal/ItemContainer.cs index 955d370..98d7ff9 100755 --- a/src/Tizen.NUI/src/internal/ItemContainer.cs +++ b/src/Tizen.NUI/src/internal/ItemContainer.cs @@ -30,7 +30,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/ItemFactory.cs b/src/Tizen.NUI/src/internal/ItemFactory.cs index 3d844a1..47e6aea 100755 --- a/src/Tizen.NUI/src/internal/ItemFactory.cs +++ b/src/Tizen.NUI/src/internal/ItemFactory.cs @@ -15,7 +15,7 @@ using System.Reflection; namespace Tizen.NUI { - + using Tizen.NUI.BaseComponents; public class ItemFactory : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; @@ -39,7 +39,7 @@ namespace Tizen.NUI public virtual void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; @@ -68,16 +68,16 @@ namespace Tizen.NUI return ret; } - public virtual Actor NewItem(uint itemId) + public virtual View NewItem(uint itemId) { - Actor ret = new Actor(NDalicPINVOKE.ItemFactory_NewItem(swigCPtr, itemId), true); + View ret = new View(NDalicPINVOKE.ItemFactory_NewItem(swigCPtr, itemId), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public virtual void ItemReleased(uint itemId, Actor actor) + public virtual void ItemReleased(uint itemId, View view) { - if (SwigDerivedClassHasMethod("ItemReleased", swigMethodTypes2)) NDalicPINVOKE.ItemFactory_ItemReleasedSwigExplicitItemFactory(swigCPtr, itemId, Actor.getCPtr(actor)); else NDalicPINVOKE.ItemFactory_ItemReleased(swigCPtr, itemId, Actor.getCPtr(actor)); + if (SwigDerivedClassHasMethod("ItemReleased", swigMethodTypes2)) NDalicPINVOKE.ItemFactory_ItemReleasedSwigExplicitItemFactory(swigCPtr, itemId, View.getCPtr(view)); else NDalicPINVOKE.ItemFactory_ItemReleased(swigCPtr, itemId, View.getCPtr(view)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -124,12 +124,12 @@ namespace Tizen.NUI private global::System.IntPtr SwigDirectorNewItem(uint itemId) { - return Actor.getCPtr(NewItem(itemId)).Handle; + return View.getCPtr(NewItem(itemId)).Handle; } private void SwigDirectorItemReleased(uint itemId, global::System.IntPtr actor) { - ItemReleased(itemId, new Actor(actor, true)); + ItemReleased(itemId, new View(actor, true)); } public delegate uint SwigDelegateItemFactory_0(); @@ -142,7 +142,7 @@ namespace Tizen.NUI private static global::System.Type[] swigMethodTypes0 = new global::System.Type[] { }; private static global::System.Type[] swigMethodTypes1 = new global::System.Type[] { typeof(uint) }; - private static global::System.Type[] swigMethodTypes2 = new global::System.Type[] { typeof(uint), typeof(Actor) }; + private static global::System.Type[] swigMethodTypes2 = new global::System.Type[] { typeof(uint), typeof(View) }; } } diff --git a/src/Tizen.NUI/src/internal/ItemIdContainer.cs b/src/Tizen.NUI/src/internal/ItemIdContainer.cs index 6ec5fb5..adcb579 100755 --- a/src/Tizen.NUI/src/internal/ItemIdContainer.cs +++ b/src/Tizen.NUI/src/internal/ItemIdContainer.cs @@ -30,7 +30,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/ItemLayout.cs b/src/Tizen.NUI/src/internal/ItemLayout.cs index 33e3478..188dc6d 100755 --- a/src/Tizen.NUI/src/internal/ItemLayout.cs +++ b/src/Tizen.NUI/src/internal/ItemLayout.cs @@ -24,10 +24,6 @@ namespace Tizen.NUI { } public override void Dispose() { - if (!Stage.IsInstalled()) { - DisposeQueue.Instance.Add(this); - return; - } lock(this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) { @@ -152,8 +148,8 @@ namespace Tizen.NUI { return ret; } - public virtual void ApplyConstraints(Actor actor, int itemId, Vector3 layoutSize, Actor itemViewActor) { - NDalicPINVOKE.ItemLayout_ApplyConstraints(swigCPtr, Actor.getCPtr(actor), itemId, Vector3.getCPtr(layoutSize), Actor.getCPtr(itemViewActor)); + public virtual void ApplyConstraints(View view, int itemId, Vector3 layoutSize, View itemView) { + NDalicPINVOKE.ItemLayout_ApplyConstraints(swigCPtr, View.getCPtr(view), itemId, Vector3.getCPtr(layoutSize), View.getCPtr(itemView)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/src/Tizen.NUI/src/internal/ItemRange.cs b/src/Tizen.NUI/src/internal/ItemRange.cs index 3b78a85..51e8679 100755 --- a/src/Tizen.NUI/src/internal/ItemRange.cs +++ b/src/Tizen.NUI/src/internal/ItemRange.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/ItemView.cs b/src/Tizen.NUI/src/internal/ItemView.cs index 0c8c02f..f3defdc 100755 --- a/src/Tizen.NUI/src/internal/ItemView.cs +++ b/src/Tizen.NUI/src/internal/ItemView.cs @@ -48,7 +48,7 @@ using System.Runtime.InteropServices; } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -95,10 +95,15 @@ using System.Runtime.InteropServices; } ~Property() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock(this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) { if (swigCMemOwn) { @@ -271,14 +276,14 @@ using System.Runtime.InteropServices; if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Actor GetItem(uint itemId) { - Actor ret = new Actor(NDalicPINVOKE.ItemView_GetItem(swigCPtr, itemId), true); + public View GetItem(uint itemId) { + View ret = new View(NDalicPINVOKE.ItemView_GetItem(swigCPtr, itemId), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public uint GetItemId(Actor actor) { - uint ret = NDalicPINVOKE.ItemView_GetItemId(swigCPtr, Actor.getCPtr(actor)); + public uint GetItemId(View view) { + uint ret = NDalicPINVOKE.ItemView_GetItemId(swigCPtr, View.getCPtr(view)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } diff --git a/src/Tizen.NUI/src/internal/KeyEventSignal.cs b/src/Tizen.NUI/src/internal/KeyEventSignal.cs index c37b3be..573209a 100755 --- a/src/Tizen.NUI/src/internal/KeyEventSignal.cs +++ b/src/Tizen.NUI/src/internal/KeyEventSignal.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/KeyInputFocusManager.cs b/src/Tizen.NUI/src/internal/KeyInputFocusManager.cs index 1286e46..13213b9 100755 --- a/src/Tizen.NUI/src/internal/KeyInputFocusManager.cs +++ b/src/Tizen.NUI/src/internal/KeyInputFocusManager.cs @@ -25,7 +25,7 @@ public class KeyInputFocusManager : BaseHandle { public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/KeyInputFocusSignal.cs b/src/Tizen.NUI/src/internal/KeyInputFocusSignal.cs index fca9044..e79a328 100755 --- a/src/Tizen.NUI/src/internal/KeyInputFocusSignal.cs +++ b/src/Tizen.NUI/src/internal/KeyInputFocusSignal.cs @@ -30,7 +30,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/KeyboardPreFocusChangeSignal.cs b/src/Tizen.NUI/src/internal/KeyboardPreFocusChangeSignal.cs index 0591bb0..6b1a1a5 100755 --- a/src/Tizen.NUI/src/internal/KeyboardPreFocusChangeSignal.cs +++ b/src/Tizen.NUI/src/internal/KeyboardPreFocusChangeSignal.cs @@ -41,7 +41,7 @@ internal class PreFocusChangeSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -83,8 +83,8 @@ internal class PreFocusChangeSignal : global::System.IDisposable { } } - public Actor Emit(Actor arg1, Actor arg2, View.FocusDirection arg3) { - Actor ret = new Actor(NDalicManualPINVOKE.PreFocusChangeSignal_Emit(swigCPtr, Actor.getCPtr(arg1), Actor.getCPtr(arg2), (int)arg3), true); + public View Emit(View arg1, View arg2, View.FocusDirection arg3) { + View ret = new View(NDalicManualPINVOKE.PreFocusChangeSignal_Emit(swigCPtr, View.getCPtr(arg1), View.getCPtr(arg2), (int)arg3), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } diff --git a/src/Tizen.NUI/src/internal/LinearConstrainer.cs b/src/Tizen.NUI/src/internal/LinearConstrainer.cs index 6146d6f..bfaa2a9 100755 --- a/src/Tizen.NUI/src/internal/LinearConstrainer.cs +++ b/src/Tizen.NUI/src/internal/LinearConstrainer.cs @@ -26,7 +26,7 @@ namespace Tizen.NUI { - internal class LinearConstrainer : Handle + internal class LinearConstrainer : BaseHandle { private global::System.Runtime.InteropServices.HandleRef swigCPtr; @@ -39,7 +39,7 @@ namespace Tizen.NUI { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -72,10 +72,15 @@ namespace Tizen.NUI { } ~Property() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock(this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) { if (swigCMemOwn) { @@ -129,9 +134,9 @@ namespace Tizen.NUI { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal void Remove(Handle target) + internal void Remove(Animatable target) { - NDalicPINVOKE.LinearConstrainer_Remove(swigCPtr, Handle.getCPtr(target)); + NDalicPINVOKE.LinearConstrainer_Remove(swigCPtr, Animatable.getCPtr(target)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -140,12 +145,12 @@ namespace Tizen.NUI { get { Tizen.NUI.PropertyArray temp = new Tizen.NUI.PropertyArray(); - GetProperty(LinearConstrainer.Property.VALUE).Get(temp); + Tizen.NUI.Object.GetProperty(swigCPtr, LinearConstrainer.Property.VALUE).Get(temp); return temp; } set { - SetProperty(LinearConstrainer.Property.VALUE, new Tizen.NUI.PropertyValue(value)); + Tizen.NUI.Object.SetProperty(swigCPtr, LinearConstrainer.Property.VALUE, new Tizen.NUI.PropertyValue(value)); } } public PropertyArray Progress @@ -153,12 +158,12 @@ namespace Tizen.NUI { get { Tizen.NUI.PropertyArray temp = new Tizen.NUI.PropertyArray(); - GetProperty(LinearConstrainer.Property.PROGRESS).Get(temp); + Tizen.NUI.Object.GetProperty(swigCPtr, LinearConstrainer.Property.PROGRESS).Get(temp); return temp; } set { - SetProperty(LinearConstrainer.Property.PROGRESS, new Tizen.NUI.PropertyValue(value)); + Tizen.NUI.Object.SetProperty(swigCPtr, LinearConstrainer.Property.PROGRESS, new Tizen.NUI.PropertyValue(value)); } } diff --git a/src/Tizen.NUI/src/internal/LongPressGestureDetectedSignal.cs b/src/Tizen.NUI/src/internal/LongPressGestureDetectedSignal.cs index 0739d70..ce013a0 100755 --- a/src/Tizen.NUI/src/internal/LongPressGestureDetectedSignal.cs +++ b/src/Tizen.NUI/src/internal/LongPressGestureDetectedSignal.cs @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ namespace Tizen.NUI { - + using Tizen.NUI.BaseComponents; internal class LongPressGestureDetectedSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -74,8 +74,8 @@ System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForD } } - public void Emit(Actor arg1, LongPressGesture arg2) { - NDalicPINVOKE.LongPressGestureDetectedSignal_Emit(swigCPtr, Actor.getCPtr(arg1), LongPressGesture.getCPtr(arg2)); + public void Emit(View arg1, LongPressGesture arg2) { + NDalicPINVOKE.LongPressGestureDetectedSignal_Emit(swigCPtr, View.getCPtr(arg1), LongPressGesture.getCPtr(arg2)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/src/Tizen.NUI/src/internal/LongPressGestureDetector.cs b/src/Tizen.NUI/src/internal/LongPressGestureDetector.cs index ab9afe4..c8fedc4 100755 --- a/src/Tizen.NUI/src/internal/LongPressGestureDetector.cs +++ b/src/Tizen.NUI/src/internal/LongPressGestureDetector.cs @@ -27,7 +27,8 @@ namespace Tizen.NUI { using System; -using System.Runtime.InteropServices; +using System.Runtime.InteropServices; +using Tizen.NUI.BaseComponents; public class LongPressGestureDetector : GestureDetector { private global::System.Runtime.InteropServices.HandleRef swigCPtr; @@ -41,7 +42,7 @@ public class LongPressGestureDetector : GestureDetector { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -64,18 +65,18 @@ public class LongPressGestureDetector : GestureDetector { public class DetectedEventArgs : EventArgs { - private Actor _actor; + private View _view; private LongPressGesture _longPressGesture; - public Actor Actor - { + public View View + { get { - return _actor; + return _view; } set { - _actor = value; + _view = value; } } @@ -134,7 +135,7 @@ public class DetectedEventArgs : EventArgs DetectedEventArgs e = new DetectedEventArgs(); // Populate all members of "e" (LongPressGestureEventArgs) with real data - e.Actor = Actor.GetActorFromPtr(actor); + e.View = View.GetViewFromPtr(actor); e.LongPressGesture = Tizen.NUI.LongPressGesture.GetLongPressGestureFromPtr(longPressGesture); if (_longPressGestureEventHandler != null) diff --git a/src/Tizen.NUI/src/internal/Matrix.cs b/src/Tizen.NUI/src/internal/Matrix.cs index 8ca964e..51278f2 100755 --- a/src/Tizen.NUI/src/internal/Matrix.cs +++ b/src/Tizen.NUI/src/internal/Matrix.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/Matrix3.cs b/src/Tizen.NUI/src/internal/Matrix3.cs index c8eae49..3bb18f9 100755 --- a/src/Tizen.NUI/src/internal/Matrix3.cs +++ b/src/Tizen.NUI/src/internal/Matrix3.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/MeshVisualShadingModeValue.cs b/src/Tizen.NUI/src/internal/MeshVisualShadingModeValue.cs deleted file mode 100755 index 137d81a..0000000 --- a/src/Tizen.NUI/src/internal/MeshVisualShadingModeValue.cs +++ /dev/null @@ -1,19 +0,0 @@ -//------------------------------------------------------------------------------ -// -// -// 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 { -/* moved to VisualMaps.cs - internal enum MeshVisualShadingModeValue { - TEXTURELESS_WITH_DIFFUSE_LIGHTING, - TEXTURED_WITH_SPECULAR_LIGHTING, - TEXTURED_WITH_DETAILED_SPECULAR_LIGHTING -} -*/ -} diff --git a/src/Tizen.NUI/src/internal/Model3dView.cs b/src/Tizen.NUI/src/internal/Model3dView.cs index 0ab1f10..aa8b740 100755 --- a/src/Tizen.NUI/src/internal/Model3dView.cs +++ b/src/Tizen.NUI/src/internal/Model3dView.cs @@ -40,7 +40,7 @@ namespace Tizen.NUI { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -73,10 +73,15 @@ namespace Tizen.NUI { } ~Property() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock(this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) { if (swigCMemOwn) { diff --git a/src/Tizen.NUI/src/internal/NDalic.cs b/src/Tizen.NUI/src/internal/NDalic.cs index ba3b552..c7c699c 100755 --- a/src/Tizen.NUI/src/internal/NDalic.cs +++ b/src/Tizen.NUI/src/internal/NDalic.cs @@ -440,12 +440,6 @@ namespace Tizen.NUI { } } - public static Handle New() { - Handle ret = new Handle(NDalicPINVOKE.New(), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - public static bool RegisterType(string name, SWIGTYPE_p_std__type_info baseType, System.Delegate f) { System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(f); { @@ -977,43 +971,43 @@ System.IntPtr ip2 = System.Runtime.InteropServices.Marshal.GetFunctionPointerFor return ret; } - public static void UnparentAndReset(Actor actor) { - NDalicPINVOKE.UnparentAndReset(Actor.getCPtr(actor)); + public static void UnparentAndReset(View view) { + NDalicPINVOKE.UnparentAndReset(View.getCPtr(view)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public static void Raise(Actor actor) { - NDalicPINVOKE.Raise(Actor.getCPtr(actor)); + public static void Raise(View view) { + NDalicPINVOKE.Raise(View.getCPtr(view)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public static void Lower(Actor actor) { - NDalicPINVOKE.Lower(Actor.getCPtr(actor)); + public static void Lower(View view) { + NDalicPINVOKE.Lower(View.getCPtr(view)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public static void RaiseToTop(Actor actor) { - NDalicPINVOKE.RaiseToTop(Actor.getCPtr(actor)); + public static void RaiseToTop(View view) { + NDalicPINVOKE.RaiseToTop(View.getCPtr(view)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public static void LowerToBottom(Actor actor) { - NDalicPINVOKE.LowerToBottom(Actor.getCPtr(actor)); + public static void LowerToBottom(View view) { + NDalicPINVOKE.LowerToBottom(View.getCPtr(view)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public static void RaiseAbove(Actor actor, Actor target) { - NDalicPINVOKE.RaiseAbove(Actor.getCPtr(actor), Actor.getCPtr(target)); + public static void RaiseAbove(View view, View target) { + NDalicPINVOKE.RaiseAbove(View.getCPtr(view), View.getCPtr(target)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public static void LowerBelow(Actor actor, Actor target) { - NDalicPINVOKE.LowerBelow(Actor.getCPtr(actor), Actor.getCPtr(target)); + public static void LowerBelow(View view, View target) { + NDalicPINVOKE.LowerBelow(View.getCPtr(view), View.getCPtr(target)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public static SWIGTYPE_p_Dali__SignalT_void_fDali__Actor_bool_Dali__DevelActor__VisibilityChange__TypeF_t VisibilityChangedSignal(Actor actor) { - SWIGTYPE_p_Dali__SignalT_void_fDali__Actor_bool_Dali__DevelActor__VisibilityChange__TypeF_t ret = new SWIGTYPE_p_Dali__SignalT_void_fDali__Actor_bool_Dali__DevelActor__VisibilityChange__TypeF_t(NDalicPINVOKE.VisibilityChangedSignal(Actor.getCPtr(actor)), false); + public static ViewVisibilityChangedSignal VisibilityChangedSignal(View view) { + ViewVisibilityChangedSignal ret = new ViewVisibilityChangedSignal(NDalicPINVOKE.VisibilityChangedSignal(View.getCPtr(view)), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } @@ -1073,6 +1067,18 @@ System.IntPtr ip2 = System.Runtime.InteropServices.Marshal.GetFunctionPointerFor return ret; } + public static KeyInputFocusSignal ResourceReadySignal(View control) { + KeyInputFocusSignal ret = new KeyInputFocusSignal(NDalicPINVOKE.ResourceReadySignal(View.getCPtr(control)), false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public static bool IsResourceReady(View control) { + bool ret = NDalicPINVOKE.IsResourceReady(View.getCPtr(control)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + public static bool IsVertical(ControlOrientationType orientation) { bool ret = NDalicPINVOKE.IsVertical((int)orientation); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/src/Tizen.NUI/src/internal/NDalicPINVOKE.cs b/src/Tizen.NUI/src/internal/NDalicPINVOKE.cs index e1f5685..a3876a4 100755 --- a/src/Tizen.NUI/src/internal/NDalicPINVOKE.cs +++ b/src/Tizen.NUI/src/internal/NDalicPINVOKE.cs @@ -6023,6 +6023,26 @@ class NDalicPINVOKE { [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_delete_ResourceImageSignal")] public static extern void delete_ResourceImageSignal(global::System.Runtime.InteropServices.HandleRef jarg1); + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_ViewVisibilityChangedSignal_Empty")] + public static extern bool ViewVisibilityChangedSignal_Empty(global::System.Runtime.InteropServices.HandleRef jarg1); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_ViewVisibilityChangedSignal_GetConnectionCount")] + public static extern uint ViewVisibilityChangedSignal_GetConnectionCount(global::System.Runtime.InteropServices.HandleRef jarg1); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_ViewVisibilityChangedSignal_Connect")] + public static extern void ViewVisibilityChangedSignal_Connect(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_ViewVisibilityChangedSignal_Disconnect")] + public static extern void ViewVisibilityChangedSignal_Disconnect(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_ViewVisibilityChangedSignal_Emit")] + public static extern void ViewVisibilityChangedSignal_Emit(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_ViewVisibilityChangedSignal")] + public static extern global::System.IntPtr new_ViewVisibilityChangedSignal(); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_delete_ViewVisibilityChangedSignal")] + public static extern void delete_ViewVisibilityChangedSignal(global::System.Runtime.InteropServices.HandleRef jarg1); [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_Timer__SWIG_0")] public static extern global::System.IntPtr new_Timer__SWIG_0(); @@ -7121,6 +7141,11 @@ class NDalicPINVOKE { [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_View__SWIG_2")] public static extern global::System.IntPtr new_View__SWIG_2(global::System.Runtime.InteropServices.HandleRef jarg1); + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_ResourceReadySignal")] + public static extern global::System.IntPtr ResourceReadySignal(global::System.Runtime.InteropServices.HandleRef jarg1); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_IsResourceReady")] + public static extern bool IsResourceReady(global::System.Runtime.InteropServices.HandleRef jarg1); [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_KeyInputFocusManager")] public static extern global::System.IntPtr new_KeyInputFocusManager(); @@ -10787,6 +10812,26 @@ class NDalicPINVOKE { [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RulerPtr_ReferenceCount")] public static extern int RulerPtr_ReferenceCount(global::System.Runtime.InteropServices.HandleRef jarg1); + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_ViewResourceReadySignal_Empty")] + public static extern bool ViewResourceReadySignal_Empty(global::System.Runtime.InteropServices.HandleRef jarg1); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_ViewResourceReadySignal_GetConnectionCount")] + public static extern uint ViewResourceReadySignal_GetConnectionCount(global::System.Runtime.InteropServices.HandleRef jarg1); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_ViewResourceReadySignal_Connect")] + public static extern void ViewResourceReadySignal_Connect(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_ViewResourceReadySignal_Disconnect")] + public static extern void ViewResourceReadySignal_Disconnect(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_ViewResourceReadySignal_Emit")] + public static extern void ViewResourceReadySignal_Emit(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_ViewResourceReadySignal")] + public static extern global::System.IntPtr new_ViewResourceReadySignal(); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_delete_ViewResourceReadySignal")] + public static extern void delete_ViewResourceReadySignal(global::System.Runtime.InteropServices.HandleRef jarg1); [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_BaseObject_SWIGUpcast")] public static extern global::System.IntPtr BaseObject_SWIGUpcast(global::System.IntPtr jarg1); diff --git a/src/Tizen.NUI/src/internal/NativeImage.cs b/src/Tizen.NUI/src/internal/NativeImage.cs index 1b932da..b157cb3 100755 --- a/src/Tizen.NUI/src/internal/NativeImage.cs +++ b/src/Tizen.NUI/src/internal/NativeImage.cs @@ -38,7 +38,7 @@ namespace Tizen.NUI { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/NativeImageInterface.cs b/src/Tizen.NUI/src/internal/NativeImageInterface.cs index 0f149be..c2bbd0f 100755 --- a/src/Tizen.NUI/src/internal/NativeImageInterface.cs +++ b/src/Tizen.NUI/src/internal/NativeImageInterface.cs @@ -22,10 +22,6 @@ namespace Tizen.NUI { } public override void Dispose() { - if (!Stage.IsInstalled()) { - DisposeQueue.Instance.Add(this); - return; - } lock(this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) { diff --git a/src/Tizen.NUI/src/internal/NinePatchImage.cs b/src/Tizen.NUI/src/internal/NinePatchImage.cs index 4593d2c..b26442e 100755 --- a/src/Tizen.NUI/src/internal/NinePatchImage.cs +++ b/src/Tizen.NUI/src/internal/NinePatchImage.cs @@ -38,7 +38,7 @@ namespace Tizen.NUI { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/Object.cs b/src/Tizen.NUI/src/internal/Object.cs new file mode 100755 index 0000000..54bc5af --- /dev/null +++ b/src/Tizen.NUI/src/internal/Object.cs @@ -0,0 +1,40 @@ +/** Copyright (c) 2017 Samsung Electronics Co., Ltd. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* 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. +* +*/ + +/** + * Static Helper class for Property + * Internal + */ + +namespace Tizen.NUI +{ + +public static class Object +{ + public static PropertyValue GetProperty(global::System.Runtime.InteropServices.HandleRef handle, int index) { + PropertyValue ret = new PropertyValue(NDalicPINVOKE.Handle_GetProperty(handle, index), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public static void SetProperty( global::System.Runtime.InteropServices.HandleRef handle, int index, PropertyValue propertyValue) + { + NDalicPINVOKE.Handle_SetProperty(handle, index, PropertyValue.getCPtr(propertyValue)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } +} + +} diff --git a/src/Tizen.NUI/src/internal/ObjectCreatedSignal.cs b/src/Tizen.NUI/src/internal/ObjectCreatedSignal.cs index 8cf3966..ab65573 100755 --- a/src/Tizen.NUI/src/internal/ObjectCreatedSignal.cs +++ b/src/Tizen.NUI/src/internal/ObjectCreatedSignal.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/ObjectDestroyedSignal.cs b/src/Tizen.NUI/src/internal/ObjectDestroyedSignal.cs index 6f59b7c..4568a93 100755 --- a/src/Tizen.NUI/src/internal/ObjectDestroyedSignal.cs +++ b/src/Tizen.NUI/src/internal/ObjectDestroyedSignal.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/ObjectRegistry.cs b/src/Tizen.NUI/src/internal/ObjectRegistry.cs index 7e524bb..a847239 100755 --- a/src/Tizen.NUI/src/internal/ObjectRegistry.cs +++ b/src/Tizen.NUI/src/internal/ObjectRegistry.cs @@ -26,7 +26,7 @@ using System.Runtime.InteropServices; } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/PaddingType.cs b/src/Tizen.NUI/src/internal/PaddingType.cs index fb40fce..72ec92d 100755 --- a/src/Tizen.NUI/src/internal/PaddingType.cs +++ b/src/Tizen.NUI/src/internal/PaddingType.cs @@ -28,7 +28,7 @@ public class PaddingType : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/PageFactory.cs b/src/Tizen.NUI/src/internal/PageFactory.cs index 120b776..13c59d1 100755 --- a/src/Tizen.NUI/src/internal/PageFactory.cs +++ b/src/Tizen.NUI/src/internal/PageFactory.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/PagePanSignal.cs b/src/Tizen.NUI/src/internal/PagePanSignal.cs index e679654..bc52bc8 100755 --- a/src/Tizen.NUI/src/internal/PagePanSignal.cs +++ b/src/Tizen.NUI/src/internal/PagePanSignal.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/PageTurnLandscapeView.cs b/src/Tizen.NUI/src/internal/PageTurnLandscapeView.cs index dc2d34e..f12ec40 100755 --- a/src/Tizen.NUI/src/internal/PageTurnLandscapeView.cs +++ b/src/Tizen.NUI/src/internal/PageTurnLandscapeView.cs @@ -38,7 +38,7 @@ namespace Tizen.NUI { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/PageTurnPortraitView.cs b/src/Tizen.NUI/src/internal/PageTurnPortraitView.cs index 066f5b8..ab4da7b 100755 --- a/src/Tizen.NUI/src/internal/PageTurnPortraitView.cs +++ b/src/Tizen.NUI/src/internal/PageTurnPortraitView.cs @@ -38,7 +38,7 @@ namespace Tizen.NUI { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/PageTurnSignal.cs b/src/Tizen.NUI/src/internal/PageTurnSignal.cs index 9debeaa..43ba6ab 100755 --- a/src/Tizen.NUI/src/internal/PageTurnSignal.cs +++ b/src/Tizen.NUI/src/internal/PageTurnSignal.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/PageTurnView.cs b/src/Tizen.NUI/src/internal/PageTurnView.cs index bd77d61..0f3b7e3 100755 --- a/src/Tizen.NUI/src/internal/PageTurnView.cs +++ b/src/Tizen.NUI/src/internal/PageTurnView.cs @@ -26,7 +26,7 @@ using Tizen.NUI.BaseComponents; } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -401,10 +401,15 @@ public class PageTurnFinishedEventArgs : EventArgs } ~Property() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock(this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) { if (swigCMemOwn) { diff --git a/src/Tizen.NUI/src/internal/PanGestureDetectedSignal.cs b/src/Tizen.NUI/src/internal/PanGestureDetectedSignal.cs index 8777c5d..3e11653 100755 --- a/src/Tizen.NUI/src/internal/PanGestureDetectedSignal.cs +++ b/src/Tizen.NUI/src/internal/PanGestureDetectedSignal.cs @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ namespace Tizen.NUI { - + using Tizen.NUI.BaseComponents; internal class PanGestureDetectedSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -74,8 +74,8 @@ System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForD } } - public void Emit(Actor arg1, PanGesture arg2) { - NDalicPINVOKE.PanGestureDetectedSignal_Emit(swigCPtr, Actor.getCPtr(arg1), PanGesture.getCPtr(arg2)); + public void Emit(View arg1, PanGesture arg2) { + NDalicPINVOKE.PanGestureDetectedSignal_Emit(swigCPtr, View.getCPtr(arg1), PanGesture.getCPtr(arg2)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/src/Tizen.NUI/src/internal/PanGestureDetector.cs b/src/Tizen.NUI/src/internal/PanGestureDetector.cs index 962c42c..4fc0be3 100755 --- a/src/Tizen.NUI/src/internal/PanGestureDetector.cs +++ b/src/Tizen.NUI/src/internal/PanGestureDetector.cs @@ -27,7 +27,8 @@ namespace Tizen.NUI { using System; -using System.Runtime.InteropServices; +using System.Runtime.InteropServices; + using Tizen.NUI.BaseComponents; public class PanGestureDetector : GestureDetector { @@ -42,7 +43,7 @@ public class PanGestureDetector : GestureDetector { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -65,18 +66,18 @@ public class PanGestureDetector : GestureDetector { public class DetectedEventArgs : EventArgs { - private Actor _actor; + private View _view; private PanGesture _panGesture; - public Actor Actor - { + public View View + { get { - return _actor; + return _view; } set { - _actor = value; + _view = value; } } @@ -135,7 +136,7 @@ public class DetectedEventArgs : EventArgs DetectedEventArgs e = new DetectedEventArgs(); // Populate all members of "e" (PanGestureEventArgs) with real data - e.Actor = Actor.GetActorFromPtr(actor); + e.View = View.GetViewFromPtr(actor); e.PanGesture = Tizen.NUI.PanGesture.GetPanGestureFromPtr(panGesture); if (_panGestureEventHandler != null) @@ -168,10 +169,15 @@ public static PanGestureDetector GetPanGestureDetectorFromPtr(global::System.Int } ~Property() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock(this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) { if (swigCMemOwn) { @@ -368,7 +374,7 @@ public static PanGestureDetector GetPanGestureDetectorFromPtr(global::System.Int get { Vector2 temp = new Vector2(0.0f,0.0f); - GetProperty( PanGestureDetector.Property.SCREEN_POSITION).Get( temp ); + Tizen.NUI.Object.GetProperty(swigCPtr, PanGestureDetector.Property.SCREEN_POSITION).Get( temp ); return temp; } } public Vector2 ScreenDisplacement @@ -376,7 +382,7 @@ public static PanGestureDetector GetPanGestureDetectorFromPtr(global::System.Int get { Vector2 temp = new Vector2(0.0f,0.0f); - GetProperty( PanGestureDetector.Property.SCREEN_DISPLACEMENT).Get( temp ); + Tizen.NUI.Object.GetProperty(swigCPtr, PanGestureDetector.Property.SCREEN_DISPLACEMENT).Get( temp ); return temp; } } public Vector2 ScreenVelocity @@ -384,7 +390,7 @@ public static PanGestureDetector GetPanGestureDetectorFromPtr(global::System.Int get { Vector2 temp = new Vector2(0.0f,0.0f); - GetProperty( PanGestureDetector.Property.SCREEN_VELOCITY).Get( temp ); + Tizen.NUI.Object.GetProperty(swigCPtr, PanGestureDetector.Property.SCREEN_VELOCITY).Get( temp ); return temp; } } public Vector2 LocalPosition @@ -392,7 +398,7 @@ public static PanGestureDetector GetPanGestureDetectorFromPtr(global::System.Int get { Vector2 temp = new Vector2(0.0f,0.0f); - GetProperty( PanGestureDetector.Property.LOCAL_POSITION).Get( temp ); + Tizen.NUI.Object.GetProperty(swigCPtr, PanGestureDetector.Property.LOCAL_POSITION).Get( temp ); return temp; } } public Vector2 LocalDisplacement @@ -400,7 +406,7 @@ public static PanGestureDetector GetPanGestureDetectorFromPtr(global::System.Int get { Vector2 temp = new Vector2(0.0f,0.0f); - GetProperty( PanGestureDetector.Property.LOCAL_DISPLACEMENT).Get( temp ); + Tizen.NUI.Object.GetProperty(swigCPtr, PanGestureDetector.Property.LOCAL_DISPLACEMENT).Get( temp ); return temp; } } public Vector2 LocalVelocity @@ -408,7 +414,7 @@ public static PanGestureDetector GetPanGestureDetectorFromPtr(global::System.Int get { Vector2 temp = new Vector2(0.0f,0.0f); - GetProperty( PanGestureDetector.Property.LOCAL_VELOCITY).Get( temp ); + Tizen.NUI.Object.GetProperty(swigCPtr, PanGestureDetector.Property.LOCAL_VELOCITY).Get( temp ); return temp; } } public bool Panning @@ -416,7 +422,7 @@ public static PanGestureDetector GetPanGestureDetectorFromPtr(global::System.Int get { bool temp = false; - GetProperty( PanGestureDetector.Property.PANNING).Get( ref temp ); + Tizen.NUI.Object.GetProperty(swigCPtr, PanGestureDetector.Property.PANNING).Get( ref temp ); return temp; } } diff --git a/src/Tizen.NUI/src/internal/PathConstrainer.cs b/src/Tizen.NUI/src/internal/PathConstrainer.cs index aadcd23..2b73097 100755 --- a/src/Tizen.NUI/src/internal/PathConstrainer.cs +++ b/src/Tizen.NUI/src/internal/PathConstrainer.cs @@ -26,7 +26,7 @@ namespace Tizen.NUI { - internal class PathConstrainer : Handle + internal class PathConstrainer : BaseHandle { private global::System.Runtime.InteropServices.HandleRef swigCPtr; @@ -39,7 +39,7 @@ namespace Tizen.NUI { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -72,10 +72,15 @@ namespace Tizen.NUI { } ~Property() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock(this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) { if (swigCMemOwn) { @@ -130,9 +135,9 @@ namespace Tizen.NUI { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal void Remove(Handle target) + internal void Remove(Animatable target) { - NDalicPINVOKE.PathConstrainer_Remove(swigCPtr, Handle.getCPtr(target)); + NDalicPINVOKE.PathConstrainer_Remove(swigCPtr, Animatable.getCPtr(target)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -141,12 +146,12 @@ namespace Tizen.NUI { get { Vector3 temp = new Vector3(0.0f, 0.0f, 0.0f); - GetProperty(PathConstrainer.Property.FORWARD).Get(temp); + Tizen.NUI.Object.GetProperty(swigCPtr, PathConstrainer.Property.FORWARD).Get(temp); return temp; } set { - SetProperty(PathConstrainer.Property.FORWARD, new Tizen.NUI.PropertyValue(value)); + Tizen.NUI.Object.SetProperty(swigCPtr, PathConstrainer.Property.FORWARD, new Tizen.NUI.PropertyValue(value)); } } @@ -155,12 +160,12 @@ namespace Tizen.NUI { get { Tizen.NUI.PropertyArray temp = new Tizen.NUI.PropertyArray(); - GetProperty(PathConstrainer.Property.POINTS).Get(temp); + Tizen.NUI.Object.GetProperty(swigCPtr, PathConstrainer.Property.POINTS).Get(temp); return temp; } set { - SetProperty(PathConstrainer.Property.POINTS, new Tizen.NUI.PropertyValue(value)); + Tizen.NUI.Object.SetProperty(swigCPtr, PathConstrainer.Property.POINTS, new Tizen.NUI.PropertyValue(value)); } } @@ -169,12 +174,12 @@ namespace Tizen.NUI { get { Tizen.NUI.PropertyArray temp = new Tizen.NUI.PropertyArray(); - GetProperty(PathConstrainer.Property.CONTROL_POINTS).Get(temp); + Tizen.NUI.Object.GetProperty(swigCPtr, PathConstrainer.Property.CONTROL_POINTS).Get(temp); return temp; } set { - SetProperty(PathConstrainer.Property.CONTROL_POINTS, new Tizen.NUI.PropertyValue(value)); + Tizen.NUI.Object.SetProperty(swigCPtr, PathConstrainer.Property.CONTROL_POINTS, new Tizen.NUI.PropertyValue(value)); } } diff --git a/src/Tizen.NUI/src/internal/PinchGestureDetectedSignal.cs b/src/Tizen.NUI/src/internal/PinchGestureDetectedSignal.cs index f0b5ca0..abeb433 100755 --- a/src/Tizen.NUI/src/internal/PinchGestureDetectedSignal.cs +++ b/src/Tizen.NUI/src/internal/PinchGestureDetectedSignal.cs @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ namespace Tizen.NUI { - + using Tizen.NUI.BaseComponents; internal class PinchGestureDetectedSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -74,8 +74,8 @@ System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForD } } - public void Emit(Actor arg1, PinchGesture arg2) { - NDalicPINVOKE.PinchGestureDetectedSignal_Emit(swigCPtr, Actor.getCPtr(arg1), PinchGesture.getCPtr(arg2)); + public void Emit(View arg1, PinchGesture arg2) { + NDalicPINVOKE.PinchGestureDetectedSignal_Emit(swigCPtr, View.getCPtr(arg1), PinchGesture.getCPtr(arg2)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/src/Tizen.NUI/src/internal/PinchGestureDetector.cs b/src/Tizen.NUI/src/internal/PinchGestureDetector.cs index d4f63fb..22587e2 100755 --- a/src/Tizen.NUI/src/internal/PinchGestureDetector.cs +++ b/src/Tizen.NUI/src/internal/PinchGestureDetector.cs @@ -28,6 +28,7 @@ namespace Tizen.NUI { using System; using System.Runtime.InteropServices; + using Tizen.NUI.BaseComponents; public class PinchGestureDetector : GestureDetector { @@ -42,7 +43,7 @@ public class PinchGestureDetector : GestureDetector { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -64,18 +65,18 @@ public class PinchGestureDetector : GestureDetector { public class DetectedEventArgs : EventArgs { - private Actor _actor; + private View _view; private PinchGesture _pinchGesture; - public Actor Actor - { + public View View + { get { - return _actor; + return _view; } set { - _actor = value; + _view = value; } } @@ -134,7 +135,7 @@ public class DetectedEventArgs : EventArgs DetectedEventArgs e = new DetectedEventArgs(); // Populate all members of "e" (DetectedEventArgs) with real data - e.Actor = Actor.GetActorFromPtr(actor); + e.View = View.GetViewFromPtr(actor); e.PinchGesture = Tizen.NUI.PinchGesture.GetPinchGestureFromPtr(pinchGesture); if (_pinchGestureEventHandler != null) diff --git a/src/Tizen.NUI/src/internal/PixelData.cs b/src/Tizen.NUI/src/internal/PixelData.cs index e740347..5b7e066 100755 --- a/src/Tizen.NUI/src/internal/PixelData.cs +++ b/src/Tizen.NUI/src/internal/PixelData.cs @@ -38,7 +38,7 @@ namespace Tizen.NUI { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/public/UIComponents/Popup.cs b/src/Tizen.NUI/src/internal/Popup.cs similarity index 97% rename from src/Tizen.NUI/src/public/UIComponents/Popup.cs rename to src/Tizen.NUI/src/internal/Popup.cs index 5fd799c..21e8a60 100755 --- a/src/Tizen.NUI/src/public/UIComponents/Popup.cs +++ b/src/Tizen.NUI/src/internal/Popup.cs @@ -50,7 +50,7 @@ namespace Tizen.NUI.UIComponents public override void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; @@ -333,11 +333,16 @@ namespace Tizen.NUI.UIComponents ~Property() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock (this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) @@ -420,15 +425,15 @@ namespace Tizen.NUI.UIComponents /// Sets a title for this Popup. /// /// The actor to set a title - public void SetTitle(Actor titleActor) + public void SetTitle(View titleView) { - NDalicPINVOKE.Popup_SetTitle(swigCPtr, Actor.getCPtr(titleActor)); + NDalicPINVOKE.Popup_SetTitle(swigCPtr, View.getCPtr(titleView)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal Actor GetTitle() + internal View GetTitle() { - Actor ret = new Actor(NDalicPINVOKE.Popup_GetTitle(swigCPtr), true); + View ret = new View(NDalicPINVOKE.Popup_GetTitle(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } @@ -437,15 +442,15 @@ namespace Tizen.NUI.UIComponents /// Sets the content actor. /// /// The actor to use - public void SetContent(Actor content) + public void SetContent(View content) { - NDalicPINVOKE.Popup_SetContent(swigCPtr, Actor.getCPtr(content)); + NDalicPINVOKE.Popup_SetContent(swigCPtr, View.getCPtr(content)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal Actor GetContent() + internal View GetContent() { - Actor ret = new Actor(NDalicPINVOKE.Popup_GetContent(swigCPtr), true); + View ret = new View(NDalicPINVOKE.Popup_GetContent(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } @@ -454,15 +459,15 @@ namespace Tizen.NUI.UIComponents /// Sets the actor to use for a footer in this Popup. /// /// The footer actor to be added to this Popup - public void SetFooter(Actor footer) + public void SetFooter(View footer) { - NDalicPINVOKE.Popup_SetFooter(swigCPtr, Actor.getCPtr(footer)); + NDalicPINVOKE.Popup_SetFooter(swigCPtr, View.getCPtr(footer)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal Actor GetFooter() + internal View GetFooter() { - Actor ret = new Actor(NDalicPINVOKE.Popup_GetFooter(swigCPtr), true); + View ret = new View(NDalicPINVOKE.Popup_GetFooter(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } diff --git a/src/Tizen.NUI/src/internal/PrimitiveVisualShapeType.cs b/src/Tizen.NUI/src/internal/PrimitiveVisualShapeType.cs deleted file mode 100755 index ff238ac..0000000 --- a/src/Tizen.NUI/src/internal/PrimitiveVisualShapeType.cs +++ /dev/null @@ -1,23 +0,0 @@ -//------------------------------------------------------------------------------ -// -// -// 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 { -/* moved to VisualMaps.cs - internal enum PrimitiveVisualShapeType { - SPHERE, - CONICAL_FRUSTRUM, - CONE, - CYLINDER, - CUBE, - OCTAHEDRON, - BEVELLED_CUBE -} -*/ -} diff --git a/src/Tizen.NUI/src/public/UIComponents/ProgressBar.cs b/src/Tizen.NUI/src/internal/ProgressBar.cs similarity index 98% rename from src/Tizen.NUI/src/public/UIComponents/ProgressBar.cs rename to src/Tizen.NUI/src/internal/ProgressBar.cs index 366ad26..1cc47d1 100755 --- a/src/Tizen.NUI/src/public/UIComponents/ProgressBar.cs +++ b/src/Tizen.NUI/src/internal/ProgressBar.cs @@ -53,7 +53,7 @@ namespace Tizen.NUI.UIComponents /// public override void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; @@ -197,11 +197,16 @@ namespace Tizen.NUI.UIComponents ~Property() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock (this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) diff --git a/src/Tizen.NUI/src/internal/ProgressBarValueChangedSignal.cs b/src/Tizen.NUI/src/internal/ProgressBarValueChangedSignal.cs index 275248a..ac4ab59 100755 --- a/src/Tizen.NUI/src/internal/ProgressBarValueChangedSignal.cs +++ b/src/Tizen.NUI/src/internal/ProgressBarValueChangedSignal.cs @@ -28,7 +28,7 @@ public class ProgressBarValueChangedSignal : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/PropertyBuffer.cs b/src/Tizen.NUI/src/internal/PropertyBuffer.cs index 5fa4727..8a416ed 100755 --- a/src/Tizen.NUI/src/internal/PropertyBuffer.cs +++ b/src/Tizen.NUI/src/internal/PropertyBuffer.cs @@ -38,7 +38,7 @@ namespace Tizen.NUI { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/PropertyCondition.cs b/src/Tizen.NUI/src/internal/PropertyCondition.cs index 82a5374..d30a053 100755 --- a/src/Tizen.NUI/src/internal/PropertyCondition.cs +++ b/src/Tizen.NUI/src/internal/PropertyCondition.cs @@ -22,7 +22,7 @@ namespace Tizen.NUI { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/PropertyNotification.cs b/src/Tizen.NUI/src/internal/PropertyNotification.cs index 3876482..d2bc022 100755 --- a/src/Tizen.NUI/src/internal/PropertyNotification.cs +++ b/src/Tizen.NUI/src/internal/PropertyNotification.cs @@ -26,7 +26,7 @@ using System.Runtime.InteropServices; } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -158,8 +158,8 @@ public class NotifyEventArgs : EventArgs return ret; } - public Handle GetTarget() { - Handle ret = new Handle(NDalicPINVOKE.PropertyNotification_GetTarget(swigCPtr), true); + public Animatable GetTarget() { + Animatable ret = new Animatable(NDalicPINVOKE.PropertyNotification_GetTarget(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } diff --git a/src/Tizen.NUI/src/internal/PropertyNotifySignal.cs b/src/Tizen.NUI/src/internal/PropertyNotifySignal.cs index 7c3db97..0f9fae2 100755 --- a/src/Tizen.NUI/src/internal/PropertyNotifySignal.cs +++ b/src/Tizen.NUI/src/internal/PropertyNotifySignal.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/PropertyRegistration.cs b/src/Tizen.NUI/src/internal/PropertyRegistration.cs index 7aa3d5e..00e1631 100755 --- a/src/Tizen.NUI/src/internal/PropertyRegistration.cs +++ b/src/Tizen.NUI/src/internal/PropertyRegistration.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/public/UIComponents/RadioButton.cs b/src/Tizen.NUI/src/internal/RadioButton.cs similarity index 99% rename from src/Tizen.NUI/src/public/UIComponents/RadioButton.cs rename to src/Tizen.NUI/src/internal/RadioButton.cs index a6f9f26..32221e9 100755 --- a/src/Tizen.NUI/src/public/UIComponents/RadioButton.cs +++ b/src/Tizen.NUI/src/internal/RadioButton.cs @@ -59,7 +59,7 @@ namespace Tizen.NUI.UIComponents /// public override void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; diff --git a/src/Tizen.NUI/src/internal/RefObject.cs b/src/Tizen.NUI/src/internal/RefObject.cs index 26f2cc8..3782c3d 100755 --- a/src/Tizen.NUI/src/internal/RefObject.cs +++ b/src/Tizen.NUI/src/internal/RefObject.cs @@ -29,7 +29,7 @@ public class RefObject : global::System.IDisposable { public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/RenderTask.cs b/src/Tizen.NUI/src/internal/RenderTask.cs index 029a9e1..b7bab08 100755 --- a/src/Tizen.NUI/src/internal/RenderTask.cs +++ b/src/Tizen.NUI/src/internal/RenderTask.cs @@ -9,8 +9,8 @@ //------------------------------------------------------------------------------ namespace Tizen.NUI { - - internal class RenderTask : Handle { + using Tizen.NUI.BaseComponents; + internal class RenderTask : Animatable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal RenderTask(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.RenderTask_SWIGUpcast(cPtr), cMemoryOwn) { @@ -22,7 +22,7 @@ namespace Tizen.NUI { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -61,10 +61,15 @@ namespace Tizen.NUI { } ~Property() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock(this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) { if (swigCMemOwn) { @@ -175,13 +180,13 @@ namespace Tizen.NUI { return ret; } - public void SetSourceActor(Actor actor) { - NDalicPINVOKE.RenderTask_SetSourceActor(swigCPtr, Actor.getCPtr(actor)); + public void SetSourceView(View view) { + NDalicPINVOKE.RenderTask_SetSourceActor(swigCPtr, View.getCPtr(view)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Actor GetSourceActor() { - Actor ret = new Actor(NDalicPINVOKE.RenderTask_GetSourceActor(swigCPtr), true); + public View GetSourceView() { + View ret = new View(NDalicPINVOKE.RenderTask_GetSourceActor(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } @@ -208,13 +213,13 @@ namespace Tizen.NUI { return ret; } - public void SetCameraActor(CameraActor cameraActor) { - NDalicPINVOKE.RenderTask_SetCameraActor(swigCPtr, CameraActor.getCPtr(cameraActor)); + public void SetCamera(Camera camera) { + NDalicPINVOKE.RenderTask_SetCameraActor(swigCPtr, Camera.getCPtr(camera)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public CameraActor GetCameraActor() { - CameraActor ret = new CameraActor(NDalicPINVOKE.RenderTask_GetCameraActor(swigCPtr), true); + public Camera GetCamera() { + Camera ret = new Camera(NDalicPINVOKE.RenderTask_GetCameraActor(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } @@ -253,13 +258,13 @@ namespace Tizen.NUI { return ret; } - public void SetScreenToFrameBufferMappingActor(Actor mappingActor) { - NDalicPINVOKE.RenderTask_SetScreenToFrameBufferMappingActor(swigCPtr, Actor.getCPtr(mappingActor)); + public void SetScreenToFrameBufferMappingView(View mappingView) { + NDalicPINVOKE.RenderTask_SetScreenToFrameBufferMappingActor(swigCPtr, View.getCPtr(mappingView)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Actor GetScreenToFrameBufferMappingActor() { - Actor ret = new Actor(NDalicPINVOKE.RenderTask_GetScreenToFrameBufferMappingActor(swigCPtr), true); + public View GetScreenToFrameBufferMappingView() { + View ret = new View(NDalicPINVOKE.RenderTask_GetScreenToFrameBufferMappingActor(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } @@ -347,8 +352,8 @@ namespace Tizen.NUI { return ret; } - public bool ViewportToLocal(Actor actor, float viewportX, float viewportY, out float localX, out float localY) { - bool ret = NDalicPINVOKE.RenderTask_ViewportToLocal(swigCPtr, Actor.getCPtr(actor), viewportX, viewportY, out localX, out localY); + public bool ViewportToLocal(View view, float viewportX, float viewportY, out float localX, out float localY) { + bool ret = NDalicPINVOKE.RenderTask_ViewportToLocal(swigCPtr, View.getCPtr(view), viewportX, viewportY, out localX, out localY); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } diff --git a/src/Tizen.NUI/src/internal/RenderTaskList.cs b/src/Tizen.NUI/src/internal/RenderTaskList.cs index 4fa79eb..c628e5a 100755 --- a/src/Tizen.NUI/src/internal/RenderTaskList.cs +++ b/src/Tizen.NUI/src/internal/RenderTaskList.cs @@ -22,7 +22,7 @@ namespace Tizen.NUI { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/RenderTaskSignal.cs b/src/Tizen.NUI/src/internal/RenderTaskSignal.cs index 6d40996..58ceee0 100755 --- a/src/Tizen.NUI/src/internal/RenderTaskSignal.cs +++ b/src/Tizen.NUI/src/internal/RenderTaskSignal.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/Renderer.cs b/src/Tizen.NUI/src/internal/Renderer.cs index bf77932..cdd1e37 100755 --- a/src/Tizen.NUI/src/internal/Renderer.cs +++ b/src/Tizen.NUI/src/internal/Renderer.cs @@ -26,7 +26,7 @@ namespace Tizen.NUI { - internal class Renderer : Handle { + internal class Renderer : Animatable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal Renderer(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Renderer_SWIGUpcast(cPtr), cMemoryOwn) { @@ -38,7 +38,7 @@ namespace Tizen.NUI { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -54,10 +54,8 @@ namespace Tizen.NUI { global::System.GC.SuppressFinalize(this); base.Dispose(); } - } - - - public class Property : global::System.IDisposable { + } + public class Property : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; @@ -71,10 +69,15 @@ namespace Tizen.NUI { } ~Property() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock(this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) { if (swigCMemOwn) { @@ -181,12 +184,12 @@ namespace Tizen.NUI { get { int temp = 0; - GetProperty( Renderer.Property.DEPTH_INDEX).Get( ref temp ); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.DEPTH_INDEX).Get( ref temp ); return temp; } set { - SetProperty( Renderer.Property.DEPTH_INDEX, new Tizen.NUI.PropertyValue( value ) ); + Tizen.NUI.Object.SetProperty(swigCPtr, Renderer.Property.DEPTH_INDEX, new Tizen.NUI.PropertyValue( value ) ); } } public int FaceCullingMode @@ -194,12 +197,12 @@ namespace Tizen.NUI { get { int temp = 0; - GetProperty( Renderer.Property.FACE_CULLING_MODE).Get( ref temp ); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.FACE_CULLING_MODE).Get( ref temp ); return temp; } set { - SetProperty( Renderer.Property.FACE_CULLING_MODE, new Tizen.NUI.PropertyValue( value ) ); + Tizen.NUI.Object.SetProperty(swigCPtr, Renderer.Property.FACE_CULLING_MODE, new Tizen.NUI.PropertyValue( value ) ); } } public int BlendMode @@ -207,12 +210,12 @@ namespace Tizen.NUI { get { int temp = 0; - GetProperty( Renderer.Property.BLEND_MODE).Get( ref temp ); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.BLEND_MODE).Get( ref temp ); return temp; } set { - SetProperty( Renderer.Property.BLEND_MODE, new Tizen.NUI.PropertyValue( value ) ); + Tizen.NUI.Object.SetProperty(swigCPtr, Renderer.Property.BLEND_MODE, new Tizen.NUI.PropertyValue( value ) ); } } public int BlendEquationRgb @@ -220,12 +223,12 @@ namespace Tizen.NUI { get { int temp = 0; - GetProperty( Renderer.Property.BLEND_EQUATION_RGB).Get( ref temp ); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.BLEND_EQUATION_RGB).Get( ref temp ); return temp; } set { - SetProperty( Renderer.Property.BLEND_EQUATION_RGB, new Tizen.NUI.PropertyValue( value ) ); + Tizen.NUI.Object.SetProperty(swigCPtr, Renderer.Property.BLEND_EQUATION_RGB, new Tizen.NUI.PropertyValue( value ) ); } } public int BlendEquationAlpha @@ -233,12 +236,12 @@ namespace Tizen.NUI { get { int temp = 0; - GetProperty( Renderer.Property.BLEND_EQUATION_ALPHA).Get( ref temp ); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.BLEND_EQUATION_ALPHA).Get( ref temp ); return temp; } set { - SetProperty( Renderer.Property.BLEND_EQUATION_ALPHA, new Tizen.NUI.PropertyValue( value ) ); + Tizen.NUI.Object.SetProperty(swigCPtr, Renderer.Property.BLEND_EQUATION_ALPHA, new Tizen.NUI.PropertyValue( value ) ); } } public int BlendFactorSrcRgb @@ -246,12 +249,12 @@ namespace Tizen.NUI { get { int temp = 0; - GetProperty( Renderer.Property.BLEND_FACTOR_SRC_RGB).Get( ref temp ); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.BLEND_FACTOR_SRC_RGB).Get( ref temp ); return temp; } set { - SetProperty( Renderer.Property.BLEND_FACTOR_SRC_RGB, new Tizen.NUI.PropertyValue( value ) ); + Tizen.NUI.Object.SetProperty(swigCPtr, Renderer.Property.BLEND_FACTOR_SRC_RGB, new Tizen.NUI.PropertyValue( value ) ); } } public int BlendFactorDestRgb @@ -259,12 +262,12 @@ namespace Tizen.NUI { get { int temp = 0; - GetProperty( Renderer.Property.BLEND_FACTOR_DEST_RGB).Get( ref temp ); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.BLEND_FACTOR_DEST_RGB).Get( ref temp ); return temp; } set { - SetProperty( Renderer.Property.BLEND_FACTOR_DEST_RGB, new Tizen.NUI.PropertyValue( value ) ); + Tizen.NUI.Object.SetProperty(swigCPtr, Renderer.Property.BLEND_FACTOR_DEST_RGB, new Tizen.NUI.PropertyValue( value ) ); } } public int BlendFactorSrcAlpha @@ -272,12 +275,12 @@ namespace Tizen.NUI { get { int temp = 0; - GetProperty( Renderer.Property.BLEND_FACTOR_SRC_ALPHA).Get( ref temp ); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.BLEND_FACTOR_SRC_ALPHA).Get( ref temp ); return temp; } set { - SetProperty( Renderer.Property.BLEND_FACTOR_SRC_ALPHA, new Tizen.NUI.PropertyValue( value ) ); + Tizen.NUI.Object.SetProperty(swigCPtr, Renderer.Property.BLEND_FACTOR_SRC_ALPHA, new Tizen.NUI.PropertyValue( value ) ); } } public int BlendFactorDestAlpha @@ -285,12 +288,12 @@ namespace Tizen.NUI { get { int temp = 0; - GetProperty( Renderer.Property.BLEND_FACTOR_DEST_ALPHA).Get( ref temp ); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.BLEND_FACTOR_DEST_ALPHA).Get( ref temp ); return temp; } set { - SetProperty( Renderer.Property.BLEND_FACTOR_DEST_ALPHA, new Tizen.NUI.PropertyValue( value ) ); + Tizen.NUI.Object.SetProperty(swigCPtr, Renderer.Property.BLEND_FACTOR_DEST_ALPHA, new Tizen.NUI.PropertyValue( value ) ); } } public Vector4 BlendColor @@ -298,12 +301,12 @@ namespace Tizen.NUI { get { Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f); - GetProperty( Renderer.Property.BLEND_COLOR).Get( temp ); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.BLEND_COLOR).Get( temp ); return temp; } set { - SetProperty( Renderer.Property.BLEND_COLOR, new Tizen.NUI.PropertyValue( value ) ); + Tizen.NUI.Object.SetProperty(swigCPtr, Renderer.Property.BLEND_COLOR, new Tizen.NUI.PropertyValue( value ) ); } } public bool BlendPreMultipliedAlpha @@ -311,12 +314,12 @@ namespace Tizen.NUI { get { bool temp = false; - GetProperty( Renderer.Property.BLEND_PRE_MULTIPLIED_ALPHA).Get( ref temp ); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.BLEND_PRE_MULTIPLIED_ALPHA).Get( ref temp ); return temp; } set { - SetProperty( Renderer.Property.BLEND_PRE_MULTIPLIED_ALPHA, new Tizen.NUI.PropertyValue( value ) ); + Tizen.NUI.Object.SetProperty(swigCPtr, Renderer.Property.BLEND_PRE_MULTIPLIED_ALPHA, new Tizen.NUI.PropertyValue( value ) ); } } public int IndexRangeFirst @@ -324,12 +327,12 @@ namespace Tizen.NUI { get { int temp = 0; - GetProperty( Renderer.Property.INDEX_RANGE_FIRST).Get( ref temp ); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.INDEX_RANGE_FIRST).Get( ref temp ); return temp; } set { - SetProperty( Renderer.Property.INDEX_RANGE_FIRST, new Tizen.NUI.PropertyValue( value ) ); + Tizen.NUI.Object.SetProperty(swigCPtr, Renderer.Property.INDEX_RANGE_FIRST, new Tizen.NUI.PropertyValue( value ) ); } } public int IndexRangeCount @@ -337,12 +340,12 @@ namespace Tizen.NUI { get { int temp = 0; - GetProperty( Renderer.Property.INDEX_RANGE_COUNT).Get( ref temp ); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.INDEX_RANGE_COUNT).Get( ref temp ); return temp; } set { - SetProperty( Renderer.Property.INDEX_RANGE_COUNT, new Tizen.NUI.PropertyValue( value ) ); + Tizen.NUI.Object.SetProperty(swigCPtr, Renderer.Property.INDEX_RANGE_COUNT, new Tizen.NUI.PropertyValue( value ) ); } } public int DepthWriteMode @@ -350,12 +353,12 @@ namespace Tizen.NUI { get { int temp = 0; - GetProperty( Renderer.Property.DEPTH_WRITE_MODE).Get( ref temp ); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.DEPTH_WRITE_MODE).Get( ref temp ); return temp; } set { - SetProperty( Renderer.Property.DEPTH_WRITE_MODE, new Tizen.NUI.PropertyValue( value ) ); + Tizen.NUI.Object.SetProperty(swigCPtr, Renderer.Property.DEPTH_WRITE_MODE, new Tizen.NUI.PropertyValue( value ) ); } } public int DepthFunction @@ -363,12 +366,12 @@ namespace Tizen.NUI { get { int temp = 0; - GetProperty( Renderer.Property.DEPTH_FUNCTION).Get( ref temp ); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.DEPTH_FUNCTION).Get( ref temp ); return temp; } set { - SetProperty( Renderer.Property.DEPTH_FUNCTION, new Tizen.NUI.PropertyValue( value ) ); + Tizen.NUI.Object.SetProperty(swigCPtr, Renderer.Property.DEPTH_FUNCTION, new Tizen.NUI.PropertyValue( value ) ); } } public int DepthTestMode @@ -376,12 +379,12 @@ namespace Tizen.NUI { get { int temp = 0; - GetProperty( Renderer.Property.DEPTH_TEST_MODE).Get( ref temp ); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.DEPTH_TEST_MODE).Get( ref temp ); return temp; } set { - SetProperty( Renderer.Property.DEPTH_TEST_MODE, new Tizen.NUI.PropertyValue( value ) ); + Tizen.NUI.Object.SetProperty(swigCPtr, Renderer.Property.DEPTH_TEST_MODE, new Tizen.NUI.PropertyValue( value ) ); } } public int RenderMode @@ -389,12 +392,12 @@ namespace Tizen.NUI { get { int temp = 0; - GetProperty( Renderer.Property.RENDER_MODE).Get( ref temp ); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.RENDER_MODE).Get( ref temp ); return temp; } set { - SetProperty( Renderer.Property.RENDER_MODE, new Tizen.NUI.PropertyValue( value ) ); + Tizen.NUI.Object.SetProperty(swigCPtr, Renderer.Property.RENDER_MODE, new Tizen.NUI.PropertyValue( value ) ); } } public int StencilFunction @@ -402,12 +405,12 @@ namespace Tizen.NUI { get { int temp = 0; - GetProperty( Renderer.Property.STENCIL_FUNCTION).Get( ref temp ); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.STENCIL_FUNCTION).Get( ref temp ); return temp; } set { - SetProperty( Renderer.Property.STENCIL_FUNCTION, new Tizen.NUI.PropertyValue( value ) ); + Tizen.NUI.Object.SetProperty(swigCPtr, Renderer.Property.STENCIL_FUNCTION, new Tizen.NUI.PropertyValue( value ) ); } } public int StencilFunctionMask @@ -415,12 +418,12 @@ namespace Tizen.NUI { get { int temp = 0; - GetProperty( Renderer.Property.STENCIL_FUNCTION_MASK).Get( ref temp ); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.STENCIL_FUNCTION_MASK).Get( ref temp ); return temp; } set { - SetProperty( Renderer.Property.STENCIL_FUNCTION_MASK, new Tizen.NUI.PropertyValue( value ) ); + Tizen.NUI.Object.SetProperty(swigCPtr, Renderer.Property.STENCIL_FUNCTION_MASK, new Tizen.NUI.PropertyValue( value ) ); } } public int StencilFunctionReference @@ -428,12 +431,12 @@ namespace Tizen.NUI { get { int temp = 0; - GetProperty( Renderer.Property.STENCIL_FUNCTION_REFERENCE).Get( ref temp ); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.STENCIL_FUNCTION_REFERENCE).Get( ref temp ); return temp; } set { - SetProperty( Renderer.Property.STENCIL_FUNCTION_REFERENCE, new Tizen.NUI.PropertyValue( value ) ); + Tizen.NUI.Object.SetProperty(swigCPtr, Renderer.Property.STENCIL_FUNCTION_REFERENCE, new Tizen.NUI.PropertyValue( value ) ); } } public int StencilMask @@ -441,12 +444,12 @@ namespace Tizen.NUI { get { int temp = 0; - GetProperty( Renderer.Property.STENCIL_MASK).Get( ref temp ); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.STENCIL_MASK).Get( ref temp ); return temp; } set { - SetProperty( Renderer.Property.STENCIL_MASK, new Tizen.NUI.PropertyValue( value ) ); + Tizen.NUI.Object.SetProperty(swigCPtr, Renderer.Property.STENCIL_MASK, new Tizen.NUI.PropertyValue( value ) ); } } public int StencilOperationOnFail @@ -454,12 +457,12 @@ namespace Tizen.NUI { get { int temp = 0; - GetProperty( Renderer.Property.STENCIL_OPERATION_ON_FAIL).Get( ref temp ); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.STENCIL_OPERATION_ON_FAIL).Get( ref temp ); return temp; } set { - SetProperty( Renderer.Property.STENCIL_OPERATION_ON_FAIL, new Tizen.NUI.PropertyValue( value ) ); + Tizen.NUI.Object.SetProperty(swigCPtr, Renderer.Property.STENCIL_OPERATION_ON_FAIL, new Tizen.NUI.PropertyValue( value ) ); } } public int StencilOperationOnZFail @@ -467,12 +470,12 @@ namespace Tizen.NUI { get { int temp = 0; - GetProperty( Renderer.Property.STENCIL_OPERATION_ON_Z_FAIL).Get( ref temp ); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.STENCIL_OPERATION_ON_Z_FAIL).Get( ref temp ); return temp; } set { - SetProperty( Renderer.Property.STENCIL_OPERATION_ON_Z_FAIL, new Tizen.NUI.PropertyValue( value ) ); + Tizen.NUI.Object.SetProperty(swigCPtr, Renderer.Property.STENCIL_OPERATION_ON_Z_FAIL, new Tizen.NUI.PropertyValue( value ) ); } } public int StencilOperationOnZPass @@ -480,12 +483,12 @@ namespace Tizen.NUI { get { int temp = 0; - GetProperty( Renderer.Property.STENCIL_OPERATION_ON_Z_PASS).Get( ref temp ); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.STENCIL_OPERATION_ON_Z_PASS).Get( ref temp ); return temp; } set { - SetProperty( Renderer.Property.STENCIL_OPERATION_ON_Z_PASS, new Tizen.NUI.PropertyValue( value ) ); + Tizen.NUI.Object.SetProperty(swigCPtr, Renderer.Property.STENCIL_OPERATION_ON_Z_PASS, new Tizen.NUI.PropertyValue( value ) ); } } diff --git a/src/Tizen.NUI/src/internal/ResourceImage.cs b/src/Tizen.NUI/src/internal/ResourceImage.cs index bd2cd22..aafc7f4 100755 --- a/src/Tizen.NUI/src/internal/ResourceImage.cs +++ b/src/Tizen.NUI/src/internal/ResourceImage.cs @@ -42,7 +42,7 @@ internal class ResourceImage : Image { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/ResourceImageSignal.cs b/src/Tizen.NUI/src/internal/ResourceImageSignal.cs index 0846019..c6c3b5f 100755 --- a/src/Tizen.NUI/src/internal/ResourceImageSignal.cs +++ b/src/Tizen.NUI/src/internal/ResourceImageSignal.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/Ruler.cs b/src/Tizen.NUI/src/internal/Ruler.cs index 2538d36..031bdf7 100755 --- a/src/Tizen.NUI/src/internal/Ruler.cs +++ b/src/Tizen.NUI/src/internal/Ruler.cs @@ -22,10 +22,6 @@ namespace Tizen.NUI { } public override void Dispose() { - if (!Stage.IsInstalled()) { - DisposeQueue.Instance.Add(this); - return; - } lock(this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) { diff --git a/src/Tizen.NUI/src/internal/RulerDomain.cs b/src/Tizen.NUI/src/internal/RulerDomain.cs index ba2bbcc..7a318d5 100755 --- a/src/Tizen.NUI/src/internal/RulerDomain.cs +++ b/src/Tizen.NUI/src/internal/RulerDomain.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/RulerPtr.cs b/src/Tizen.NUI/src/internal/RulerPtr.cs index 22029ca..4840640 100755 --- a/src/Tizen.NUI/src/internal/RulerPtr.cs +++ b/src/Tizen.NUI/src/internal/RulerPtr.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/Sampler.cs b/src/Tizen.NUI/src/internal/Sampler.cs index 9d3fa20..289733b 100755 --- a/src/Tizen.NUI/src/internal/Sampler.cs +++ b/src/Tizen.NUI/src/internal/Sampler.cs @@ -38,7 +38,7 @@ namespace Tizen.NUI { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/SamplingModeType.cs b/src/Tizen.NUI/src/internal/SamplingModeType.cs deleted file mode 100755 index df9400b..0000000 --- a/src/Tizen.NUI/src/internal/SamplingModeType.cs +++ /dev/null @@ -1,23 +0,0 @@ -//------------------------------------------------------------------------------ -// -// -// 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 { -/* moved to VisualMaps.cs -public enum SamplingModeType { - BOX, - NEAREST, - LINEAR, - BOX_THEN_NEAREST, - BOX_THEN_LINEAR, - NO_FILTER, - DONT_CARE -} -*/ -} diff --git a/src/Tizen.NUI/src/internal/ScrollView.cs b/src/Tizen.NUI/src/internal/ScrollView.cs index fe510c9..83cada5 100755 --- a/src/Tizen.NUI/src/internal/ScrollView.cs +++ b/src/Tizen.NUI/src/internal/ScrollView.cs @@ -42,7 +42,7 @@ using Tizen.NUI.BaseComponents; } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -158,10 +158,15 @@ public class SnapStartedEventArgs : EventArgs } ~ClampEvent() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock(this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) { if (swigCMemOwn) { @@ -232,10 +237,15 @@ public class SnapStartedEventArgs : EventArgs } ~SnapEvent() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock(this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) { if (swigCMemOwn) { @@ -311,10 +321,15 @@ public class SnapStartedEventArgs : EventArgs } ~Property() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock(this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) { if (swigCMemOwn) { @@ -453,7 +468,7 @@ public class SnapStartedEventArgs : EventArgs if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void SetActorAutoSnap(bool enable) { + public void SetViewAutoSnap(bool enable) { NDalicPINVOKE.ScrollView_SetActorAutoSnap(swigCPtr, enable); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -614,13 +629,13 @@ public class SnapStartedEventArgs : EventArgs if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void ScrollTo(Actor actor) { - NDalicPINVOKE.ScrollView_ScrollTo__SWIG_8(swigCPtr, Actor.getCPtr(actor)); + public void ScrollTo(View view) { + NDalicPINVOKE.ScrollView_ScrollTo__SWIG_8(swigCPtr, View.getCPtr(view)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void ScrollTo(Actor actor, float duration) { - NDalicPINVOKE.ScrollView_ScrollTo__SWIG_9(swigCPtr, Actor.getCPtr(actor), duration); + public void ScrollTo(View view, float duration) { + NDalicPINVOKE.ScrollView_ScrollTo__SWIG_9(swigCPtr, View.getCPtr(view), duration); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -655,13 +670,13 @@ public class SnapStartedEventArgs : EventArgs if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void BindActor(Actor child) { - NDalicPINVOKE.ScrollView_BindActor(swigCPtr, Actor.getCPtr(child)); + public void BindView(View child) { + NDalicPINVOKE.ScrollView_BindActor(swigCPtr, View.getCPtr(child)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void UnbindActor(Actor child) { - NDalicPINVOKE.ScrollView_UnbindActor(swigCPtr, Actor.getCPtr(child)); + public void UnbindView(View child) { + NDalicPINVOKE.ScrollView_UnbindActor(swigCPtr, View.getCPtr(child)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/src/Tizen.NUI/src/internal/ScrollViewEffect.cs b/src/Tizen.NUI/src/internal/ScrollViewEffect.cs index 038e56c..40ac2da 100755 --- a/src/Tizen.NUI/src/internal/ScrollViewEffect.cs +++ b/src/Tizen.NUI/src/internal/ScrollViewEffect.cs @@ -22,7 +22,7 @@ namespace Tizen.NUI { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/ScrollViewPagePathEffect.cs b/src/Tizen.NUI/src/internal/ScrollViewPagePathEffect.cs index da1d76b..2f81901 100755 --- a/src/Tizen.NUI/src/internal/ScrollViewPagePathEffect.cs +++ b/src/Tizen.NUI/src/internal/ScrollViewPagePathEffect.cs @@ -25,7 +25,7 @@ //------------------------------------------------------------------------------ namespace Tizen.NUI { - + using Tizen.NUI.BaseComponents; internal class ScrollViewPagePathEffect : ScrollViewEffect { private global::System.Runtime.InteropServices.HandleRef swigCPtr; @@ -38,7 +38,7 @@ namespace Tizen.NUI { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -67,8 +67,8 @@ namespace Tizen.NUI { return ret; } - public void ApplyToPage(Actor page, uint pageOrder) { - NDalicPINVOKE.ScrollViewPagePathEffect_ApplyToPage(swigCPtr, Actor.getCPtr(page), pageOrder); + public void ApplyToPage(View page, uint pageOrder) { + NDalicPINVOKE.ScrollViewPagePathEffect_ApplyToPage(swigCPtr, View.getCPtr(page), pageOrder); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/src/Tizen.NUI/src/internal/ScrollViewSnapStartedSignal.cs b/src/Tizen.NUI/src/internal/ScrollViewSnapStartedSignal.cs index 6672bdf..2fd97ce 100755 --- a/src/Tizen.NUI/src/internal/ScrollViewSnapStartedSignal.cs +++ b/src/Tizen.NUI/src/internal/ScrollViewSnapStartedSignal.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/Scrollable.cs b/src/Tizen.NUI/src/internal/Scrollable.cs index 0ce6416..82a857a 100755 --- a/src/Tizen.NUI/src/internal/Scrollable.cs +++ b/src/Tizen.NUI/src/internal/Scrollable.cs @@ -26,7 +26,7 @@ using Tizen.NUI.BaseComponents; } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -265,10 +265,16 @@ public class CompletedEventArgs : EventArgs } ~Property() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock(this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) { if (swigCMemOwn) { diff --git a/src/Tizen.NUI/src/internal/ScrollableSignal.cs b/src/Tizen.NUI/src/internal/ScrollableSignal.cs index 4bbfcd6..89ff189 100755 --- a/src/Tizen.NUI/src/internal/ScrollableSignal.cs +++ b/src/Tizen.NUI/src/internal/ScrollableSignal.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/Shader.cs b/src/Tizen.NUI/src/internal/Shader.cs index 4babca0..46eb781 100755 --- a/src/Tizen.NUI/src/internal/Shader.cs +++ b/src/Tizen.NUI/src/internal/Shader.cs @@ -26,7 +26,7 @@ namespace Tizen.NUI { - internal class Shader : Handle { + internal class Shader : Animatable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal Shader(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Shader_SWIGUpcast(cPtr), cMemoryOwn) { @@ -38,7 +38,7 @@ namespace Tizen.NUI { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -71,10 +71,15 @@ namespace Tizen.NUI { } ~Hint() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock(this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) { if (swigCMemOwn) { @@ -113,10 +118,15 @@ namespace Tizen.NUI { } ~Property() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock(this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) { if (swigCMemOwn) { @@ -165,13 +175,13 @@ namespace Tizen.NUI { { get { - Tizen.NUI.PropertyMap temp = new Tizen.NUI.PropertyMap(); - GetProperty( Shader.Property.PROGRAM).Get( temp ); + Tizen.NUI.PropertyMap temp = new Tizen.NUI.PropertyMap(); + Tizen.NUI.Object.GetProperty(swigCPtr, Shader.Property.PROGRAM).Get( temp ); return temp; } set { - SetProperty( Shader.Property.PROGRAM, new Tizen.NUI.PropertyValue( value ) ); + Tizen.NUI.Object.SetProperty(swigCPtr, Shader.Property.PROGRAM, new Tizen.NUI.PropertyValue( value ) ); } } diff --git a/src/Tizen.NUI/src/internal/SignalConnectorType.cs b/src/Tizen.NUI/src/internal/SignalConnectorType.cs index 3c3707f..0e2035c 100755 --- a/src/Tizen.NUI/src/internal/SignalConnectorType.cs +++ b/src/Tizen.NUI/src/internal/SignalConnectorType.cs @@ -29,7 +29,7 @@ namespace Tizen.NUI { public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/SignalObserver.cs b/src/Tizen.NUI/src/internal/SignalObserver.cs index 622377b..05430bc 100755 --- a/src/Tizen.NUI/src/internal/SignalObserver.cs +++ b/src/Tizen.NUI/src/internal/SignalObserver.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/public/Size.cs b/src/Tizen.NUI/src/internal/Size.cs similarity index 99% rename from src/Tizen.NUI/src/public/Size.cs rename to src/Tizen.NUI/src/internal/Size.cs index 4c717eb..2785a3a 100755 --- a/src/Tizen.NUI/src/public/Size.cs +++ b/src/Tizen.NUI/src/internal/Size.cs @@ -47,7 +47,7 @@ namespace Tizen.NUI /// public virtual void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; diff --git a/src/Tizen.NUI/src/public/UIComponents/Slider.cs b/src/Tizen.NUI/src/internal/Slider.cs similarity index 99% rename from src/Tizen.NUI/src/public/UIComponents/Slider.cs rename to src/Tizen.NUI/src/internal/Slider.cs index 6d8ec30..f45a8dd 100755 --- a/src/Tizen.NUI/src/public/UIComponents/Slider.cs +++ b/src/Tizen.NUI/src/internal/Slider.cs @@ -53,7 +53,7 @@ namespace Tizen.NUI.UIComponents /// public override void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; @@ -363,11 +363,16 @@ namespace Tizen.NUI.UIComponents ~Property() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock (this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) diff --git a/src/Tizen.NUI/src/internal/SliderMarkReachedSignal.cs b/src/Tizen.NUI/src/internal/SliderMarkReachedSignal.cs index f5d3a62..1b77243 100755 --- a/src/Tizen.NUI/src/internal/SliderMarkReachedSignal.cs +++ b/src/Tizen.NUI/src/internal/SliderMarkReachedSignal.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/SliderValueChangedSignal.cs b/src/Tizen.NUI/src/internal/SliderValueChangedSignal.cs index d22b923..b3098ef 100755 --- a/src/Tizen.NUI/src/internal/SliderValueChangedSignal.cs +++ b/src/Tizen.NUI/src/internal/SliderValueChangedSignal.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/SlotObserver.cs b/src/Tizen.NUI/src/internal/SlotObserver.cs index a07d1c5..1eb23d2 100755 --- a/src/Tizen.NUI/src/internal/SlotObserver.cs +++ b/src/Tizen.NUI/src/internal/SlotObserver.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/StageWheelSignal.cs b/src/Tizen.NUI/src/internal/StageWheelSignal.cs index 0e45c1c..3f6ab6b 100755 --- a/src/Tizen.NUI/src/internal/StageWheelSignal.cs +++ b/src/Tizen.NUI/src/internal/StageWheelSignal.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/StringValuePair.cs b/src/Tizen.NUI/src/internal/StringValuePair.cs index 39991e6..3c83496 100755 --- a/src/Tizen.NUI/src/internal/StringValuePair.cs +++ b/src/Tizen.NUI/src/internal/StringValuePair.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/StyleChangedSignal.cs b/src/Tizen.NUI/src/internal/StyleChangedSignal.cs index 4453263..fb13b60 100755 --- a/src/Tizen.NUI/src/internal/StyleChangedSignal.cs +++ b/src/Tizen.NUI/src/internal/StyleChangedSignal.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/TapGestureDetectedSignal.cs b/src/Tizen.NUI/src/internal/TapGestureDetectedSignal.cs index 9e800a5..d0c1426 100755 --- a/src/Tizen.NUI/src/internal/TapGestureDetectedSignal.cs +++ b/src/Tizen.NUI/src/internal/TapGestureDetectedSignal.cs @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ namespace Tizen.NUI { - + using Tizen.NUI.BaseComponents; internal class TapGestureDetectedSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -74,8 +74,8 @@ System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForD } } - public void Emit(Actor arg1, TapGesture arg2) { - NDalicPINVOKE.TapGestureDetectedSignal_Emit(swigCPtr, Actor.getCPtr(arg1), TapGesture.getCPtr(arg2)); + public void Emit(View arg1, TapGesture arg2) { + NDalicPINVOKE.TapGestureDetectedSignal_Emit(swigCPtr, View.getCPtr(arg1), TapGesture.getCPtr(arg2)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/src/Tizen.NUI/src/internal/TapGestureDetector.cs b/src/Tizen.NUI/src/internal/TapGestureDetector.cs index 1cb10f2..3e35a6f 100755 --- a/src/Tizen.NUI/src/internal/TapGestureDetector.cs +++ b/src/Tizen.NUI/src/internal/TapGestureDetector.cs @@ -27,7 +27,8 @@ namespace Tizen.NUI { using System; -using System.Runtime.InteropServices; +using System.Runtime.InteropServices; + using Tizen.NUI.BaseComponents; public class TapGestureDetector : GestureDetector { private global::System.Runtime.InteropServices.HandleRef swigCPtr; @@ -41,7 +42,7 @@ public class TapGestureDetector : GestureDetector { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -64,18 +65,18 @@ public class TapGestureDetector : GestureDetector { public class DetectedEventArgs : EventArgs { - private Actor _actor; + private View _view; private TapGesture _tapGesture; - public Actor Actor - { + public View View + { get { - return _actor; + return _view; } set { - _actor = value; + _view = value; } } @@ -134,7 +135,7 @@ public class DetectedEventArgs : EventArgs DetectedEventArgs e = new DetectedEventArgs(); // Populate all members of "e" (DetectedEventArgs) with real data - e.Actor = Actor.GetActorFromPtr(actor); + e.View = View.GetViewFromPtr(actor); e.TapGesture = Tizen.NUI.TapGesture.GetTapGestureFromPtr(tapGesture); if (_tapGestureEventHandler != null) diff --git a/src/Tizen.NUI/src/internal/TextEditorSignal.cs b/src/Tizen.NUI/src/internal/TextEditorSignal.cs index b6d8a85..d6ec52f 100755 --- a/src/Tizen.NUI/src/internal/TextEditorSignal.cs +++ b/src/Tizen.NUI/src/internal/TextEditorSignal.cs @@ -30,7 +30,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/TextFieldSignal.cs b/src/Tizen.NUI/src/internal/TextFieldSignal.cs index e542603..664de57 100755 --- a/src/Tizen.NUI/src/internal/TextFieldSignal.cs +++ b/src/Tizen.NUI/src/internal/TextFieldSignal.cs @@ -30,7 +30,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/Texture.cs b/src/Tizen.NUI/src/internal/Texture.cs index 62f9d31..c31dc88 100755 --- a/src/Tizen.NUI/src/internal/Texture.cs +++ b/src/Tizen.NUI/src/internal/Texture.cs @@ -38,7 +38,7 @@ namespace Tizen.NUI { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/TextureSet.cs b/src/Tizen.NUI/src/internal/TextureSet.cs index 7e69e1a..ca7774c 100755 --- a/src/Tizen.NUI/src/internal/TextureSet.cs +++ b/src/Tizen.NUI/src/internal/TextureSet.cs @@ -38,7 +38,7 @@ namespace Tizen.NUI { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/TimePeriod.cs b/src/Tizen.NUI/src/internal/TimePeriod.cs index 91d5fe8..fb992ba 100755 --- a/src/Tizen.NUI/src/internal/TimePeriod.cs +++ b/src/Tizen.NUI/src/internal/TimePeriod.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/TimerSignalType.cs b/src/Tizen.NUI/src/internal/TimerSignalType.cs index 34b1d06..eda4f3e 100755 --- a/src/Tizen.NUI/src/internal/TimerSignalType.cs +++ b/src/Tizen.NUI/src/internal/TimerSignalType.cs @@ -29,7 +29,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/ToggleButton.cs b/src/Tizen.NUI/src/internal/ToggleButton.cs index 52df7c6..ac08ca5 100755 --- a/src/Tizen.NUI/src/internal/ToggleButton.cs +++ b/src/Tizen.NUI/src/internal/ToggleButton.cs @@ -40,7 +40,7 @@ public class ToggleButton : Tizen.NUI.UIComponents.Button { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -71,10 +71,15 @@ public class ToggleButton : Tizen.NUI.UIComponents.Button { } ~Property() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock(this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) { if (swigCMemOwn) { diff --git a/src/Tizen.NUI/src/internal/ActorTouchDataSignal.cs b/src/Tizen.NUI/src/internal/TouchDataSignal.cs similarity index 86% rename from src/Tizen.NUI/src/internal/ActorTouchDataSignal.cs rename to src/Tizen.NUI/src/internal/TouchDataSignal.cs index d3b6fb4..93f64e1 100755 --- a/src/Tizen.NUI/src/internal/ActorTouchDataSignal.cs +++ b/src/Tizen.NUI/src/internal/TouchDataSignal.cs @@ -2,33 +2,33 @@ // // // This file was automatically generated by SWIG (http://www.swig.org). -// Version 3.0.9 +// Version 3.0.10 // // Do not make changes to this file unless you know what you are doing--modify // the SWIG interface file instead. //------------------------------------------------------------------------------ namespace Tizen.NUI { - - internal class ActorTouchDataSignal : global::System.IDisposable { + using Tizen.NUI.BaseComponents; +internal class TouchDataSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; - internal ActorTouchDataSignal(global::System.IntPtr cPtr, bool cMemoryOwn) { + internal TouchDataSignal(global::System.IntPtr cPtr, bool cMemoryOwn) { swigCMemOwn = cMemoryOwn; swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); } - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ActorTouchDataSignal obj) { + internal static global::System.Runtime.InteropServices.HandleRef getCPtr(TouchDataSignal obj) { return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; } - ~ActorTouchDataSignal() { + ~TouchDataSignal() { DisposeQueue.Instance.Add(this); } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -74,13 +74,13 @@ System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForD } } - public bool Emit(Actor arg1, Touch arg2) { - bool ret = NDalicPINVOKE.ActorTouchDataSignal_Emit(swigCPtr, Actor.getCPtr(arg1), Touch.getCPtr(arg2)); + public bool Emit(View arg1, Touch arg2) { + bool ret = NDalicPINVOKE.ActorTouchDataSignal_Emit(swigCPtr, View.getCPtr(arg1), Touch.getCPtr(arg2)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public ActorTouchDataSignal() : this(NDalicPINVOKE.new_ActorTouchDataSignal(), true) { + public TouchDataSignal() : this(NDalicPINVOKE.new_ActorTouchDataSignal(), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/src/Tizen.NUI/src/internal/TouchPoint.cs b/src/Tizen.NUI/src/internal/TouchPoint.cs index 6f6b51f..e2ccda6 100755 --- a/src/Tizen.NUI/src/internal/TouchPoint.cs +++ b/src/Tizen.NUI/src/internal/TouchPoint.cs @@ -10,6 +10,7 @@ namespace Tizen.NUI { + using Tizen.NUI.BaseComponents; internal class TouchPoint : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; @@ -28,7 +29,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -78,14 +79,14 @@ namespace Tizen.NUI { } } - public Actor hitActor { + public View hitView { set { - NDalicPINVOKE.TouchPoint_hitActor_set(swigCPtr, Actor.getCPtr(value)); + NDalicPINVOKE.TouchPoint_hitActor_set(swigCPtr, View.getCPtr(value)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } get { global::System.IntPtr cPtr = NDalicPINVOKE.TouchPoint_hitActor_get(swigCPtr); - Actor ret = (cPtr == global::System.IntPtr.Zero) ? null : new Actor(cPtr, false); + View ret = (cPtr == global::System.IntPtr.Zero) ? null : new View(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } diff --git a/src/Tizen.NUI/src/internal/TouchPointContainer.cs b/src/Tizen.NUI/src/internal/TouchPointContainer.cs index 5640472..5135ddb 100755 --- a/src/Tizen.NUI/src/internal/TouchPointContainer.cs +++ b/src/Tizen.NUI/src/internal/TouchPointContainer.cs @@ -30,7 +30,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/TouchSignal.cs b/src/Tizen.NUI/src/internal/TouchSignal.cs index 5d3115a..df4a3f3 100755 --- a/src/Tizen.NUI/src/internal/TouchSignal.cs +++ b/src/Tizen.NUI/src/internal/TouchSignal.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/TransitionData.cs b/src/Tizen.NUI/src/internal/TransitionData.cs index 5730ee3..dd417bb 100755 --- a/src/Tizen.NUI/src/internal/TransitionData.cs +++ b/src/Tizen.NUI/src/internal/TransitionData.cs @@ -38,7 +38,7 @@ public class TransitionData : BaseHandle { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/TypeAction.cs b/src/Tizen.NUI/src/internal/TypeAction.cs index e754db5..e1de0cc 100755 --- a/src/Tizen.NUI/src/internal/TypeAction.cs +++ b/src/Tizen.NUI/src/internal/TypeAction.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/TypeInfo.cs b/src/Tizen.NUI/src/internal/TypeInfo.cs index ba0abab..4b287ad 100755 --- a/src/Tizen.NUI/src/internal/TypeInfo.cs +++ b/src/Tizen.NUI/src/internal/TypeInfo.cs @@ -22,7 +22,7 @@ public class TypeInfo : BaseHandle { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/TypeRegistration.cs b/src/Tizen.NUI/src/internal/TypeRegistration.cs index 359d9e5..e47da5a 100755 --- a/src/Tizen.NUI/src/internal/TypeRegistration.cs +++ b/src/Tizen.NUI/src/internal/TypeRegistration.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/TypeRegistry.cs b/src/Tizen.NUI/src/internal/TypeRegistry.cs index ac6170c..03ebb05 100755 --- a/src/Tizen.NUI/src/internal/TypeRegistry.cs +++ b/src/Tizen.NUI/src/internal/TypeRegistry.cs @@ -22,7 +22,7 @@ public class TypeRegistry : BaseHandle { } public override void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/Uint16Pair.cs b/src/Tizen.NUI/src/internal/Uint16Pair.cs index 6b9bf64..d7bc710 100755 --- a/src/Tizen.NUI/src/internal/Uint16Pair.cs +++ b/src/Tizen.NUI/src/internal/Uint16Pair.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/VectorBase.cs b/src/Tizen.NUI/src/internal/VectorBase.cs index 40ea62c..513c48e 100755 --- a/src/Tizen.NUI/src/internal/VectorBase.cs +++ b/src/Tizen.NUI/src/internal/VectorBase.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/VectorFloat.cs b/src/Tizen.NUI/src/internal/VectorFloat.cs index 6e6eaea..349cf5f 100755 --- a/src/Tizen.NUI/src/internal/VectorFloat.cs +++ b/src/Tizen.NUI/src/internal/VectorFloat.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/VectorInteger.cs b/src/Tizen.NUI/src/internal/VectorInteger.cs index e338d0c..381ee99 100755 --- a/src/Tizen.NUI/src/internal/VectorInteger.cs +++ b/src/Tizen.NUI/src/internal/VectorInteger.cs @@ -28,7 +28,7 @@ internal class VectorInteger : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/VectorUint16Pair.cs b/src/Tizen.NUI/src/internal/VectorUint16Pair.cs index 70b06ed..65851cd 100755 --- a/src/Tizen.NUI/src/internal/VectorUint16Pair.cs +++ b/src/Tizen.NUI/src/internal/VectorUint16Pair.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/VectorUnsignedChar.cs b/src/Tizen.NUI/src/internal/VectorUnsignedChar.cs index f1a6f5d..f673ecc 100755 --- a/src/Tizen.NUI/src/internal/VectorUnsignedChar.cs +++ b/src/Tizen.NUI/src/internal/VectorUnsignedChar.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/VideoViewSignal.cs b/src/Tizen.NUI/src/internal/VideoViewSignal.cs index 97221d5..20514f4 100755 --- a/src/Tizen.NUI/src/internal/VideoViewSignal.cs +++ b/src/Tizen.NUI/src/internal/VideoViewSignal.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/ActorContainer.cs b/src/Tizen.NUI/src/internal/ViewContainer.cs similarity index 73% rename from src/Tizen.NUI/src/internal/ActorContainer.cs rename to src/Tizen.NUI/src/internal/ViewContainer.cs index 524a943..f42056d 100755 --- a/src/Tizen.NUI/src/internal/ActorContainer.cs +++ b/src/Tizen.NUI/src/internal/ViewContainer.cs @@ -2,35 +2,36 @@ // // // This file was automatically generated by SWIG (http://www.swig.org). -// Version 3.0.9 +// Version 3.0.10 // // Do not make changes to this file unless you know what you are doing--modify // the SWIG interface file instead. //------------------------------------------------------------------------------ namespace Tizen.NUI { + using Tizen.NUI.BaseComponents; -internal class ActorContainer : global::System.IDisposable, global::System.Collections.IEnumerable - , global::System.Collections.Generic.IEnumerable +public class ViewContainer : global::System.IDisposable, global::System.Collections.IEnumerable + , global::System.Collections.Generic.IEnumerable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; - internal ActorContainer(global::System.IntPtr cPtr, bool cMemoryOwn) { + internal ViewContainer(global::System.IntPtr cPtr, bool cMemoryOwn) { swigCMemOwn = cMemoryOwn; swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); } - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ActorContainer obj) { + internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ViewContainer obj) { return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; } - ~ActorContainer() { + ~ViewContainer() { DisposeQueue.Instance.Add(this); } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -48,10 +49,10 @@ internal class ActorContainer : global::System.IDisposable, global::System.Colle } - public ActorContainer(global::System.Collections.ICollection c) : this() { + public ViewContainer(global::System.Collections.ICollection c) : this() { if (c == null) throw new global::System.ArgumentNullException("c"); - foreach (Actor element in c) { + foreach (View element in c) { this.Add(element); } } @@ -68,7 +69,7 @@ internal class ActorContainer : global::System.IDisposable, global::System.Colle } } - public Actor this[int index] { + public View this[int index] { get { return getitem(index); } @@ -100,17 +101,17 @@ internal class ActorContainer : global::System.IDisposable, global::System.Colle } } - public void CopyTo(Actor[] array) + public void CopyTo(View[] array) { CopyTo(0, array, 0, this.Count); } - public void CopyTo(Actor[] array, int arrayIndex) + public void CopyTo(View[] array, int arrayIndex) { CopyTo(0, array, arrayIndex, this.Count); } - public void CopyTo(int index, Actor[] array, int arrayIndex, int count) + public void CopyTo(int index, View[] array, int arrayIndex, int count) { if (array == null) throw new global::System.ArgumentNullException("array"); @@ -128,16 +129,16 @@ internal class ActorContainer : global::System.IDisposable, global::System.Colle array.SetValue(getitemcopy(index+i), arrayIndex+i); } - global::System.Collections.Generic.IEnumerator global::System.Collections.Generic.IEnumerable.GetEnumerator() { - return new ActorContainerEnumerator(this); + global::System.Collections.Generic.IEnumerator global::System.Collections.Generic.IEnumerable.GetEnumerator() { + return new ViewContainerEnumerator(this); } global::System.Collections.IEnumerator global::System.Collections.IEnumerable.GetEnumerator() { - return new ActorContainerEnumerator(this); + return new ViewContainerEnumerator(this); } - public ActorContainerEnumerator GetEnumerator() { - return new ActorContainerEnumerator(this); + public ViewContainerEnumerator GetEnumerator() { + return new ViewContainerEnumerator(this); } // Type-safe enumerator @@ -145,15 +146,15 @@ internal class ActorContainer : global::System.IDisposable, global::System.Colle /// whenever the collection is modified. This has been done for changes in the size of the /// collection but not when one of the elements of the collection is modified as it is a bit /// tricky to detect unmanaged code that modifies the collection under our feet. - public sealed class ActorContainerEnumerator : global::System.Collections.IEnumerator - , global::System.Collections.Generic.IEnumerator + public sealed class ViewContainerEnumerator : global::System.Collections.IEnumerator + , global::System.Collections.Generic.IEnumerator { - private ActorContainer collectionRef; + private ViewContainer collectionRef; private int currentIndex; private object currentObject; private int currentSize; - public ActorContainerEnumerator(ActorContainer collection) { + public ViewContainerEnumerator(ViewContainer collection) { collectionRef = collection; currentIndex = -1; currentObject = null; @@ -161,7 +162,7 @@ internal class ActorContainer : global::System.IDisposable, global::System.Colle } // Type-safe iterator Current - public Actor Current { + public View Current { get { if (currentIndex == -1) throw new global::System.InvalidOperationException("Enumeration not started."); @@ -169,7 +170,7 @@ internal class ActorContainer : global::System.IDisposable, global::System.Colle throw new global::System.InvalidOperationException("Enumeration finished."); if (currentObject == null) throw new global::System.InvalidOperationException("Collection modified."); - return (Actor)currentObject; + return (View)currentObject; } } @@ -211,8 +212,8 @@ internal class ActorContainer : global::System.IDisposable, global::System.Colle if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void Add(Actor x) { - NDalicPINVOKE.ActorContainer_Add(swigCPtr, Actor.getCPtr(x)); + public void Add(View x) { + NDalicPINVOKE.ActorContainer_Add(swigCPtr, View.getCPtr(x)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -233,54 +234,54 @@ internal class ActorContainer : global::System.IDisposable, global::System.Colle if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public ActorContainer() : this(NDalicPINVOKE.new_ActorContainer__SWIG_0(), true) { + public ViewContainer() : this(NDalicPINVOKE.new_ActorContainer__SWIG_0(), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public ActorContainer(ActorContainer other) : this(NDalicPINVOKE.new_ActorContainer__SWIG_1(ActorContainer.getCPtr(other)), true) { + public ViewContainer(ViewContainer other) : this(NDalicPINVOKE.new_ActorContainer__SWIG_1(ViewContainer.getCPtr(other)), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public ActorContainer(int capacity) : this(NDalicPINVOKE.new_ActorContainer__SWIG_2(capacity), true) { + public ViewContainer(int capacity) : this(NDalicPINVOKE.new_ActorContainer__SWIG_2(capacity), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - private Actor getitemcopy(int index) { - Actor ret = new Actor(NDalicPINVOKE.ActorContainer_getitemcopy(swigCPtr, index), true); + private View getitemcopy(int index) { + View ret = new View(NDalicPINVOKE.ActorContainer_getitemcopy(swigCPtr, index), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - private Actor getitem(int index) { - Actor ret = new Actor(NDalicPINVOKE.ActorContainer_getitem(swigCPtr, index), false); + private View getitem(int index) { + View ret = new View(NDalicPINVOKE.ActorContainer_getitem(swigCPtr, index), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - private void setitem(int index, Actor val) { - NDalicPINVOKE.ActorContainer_setitem(swigCPtr, index, Actor.getCPtr(val)); + private void setitem(int index, View val) { + NDalicPINVOKE.ActorContainer_setitem(swigCPtr, index, View.getCPtr(val)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void AddRange(ActorContainer values) { - NDalicPINVOKE.ActorContainer_AddRange(swigCPtr, ActorContainer.getCPtr(values)); + public void AddRange(ViewContainer values) { + NDalicPINVOKE.ActorContainer_AddRange(swigCPtr, ViewContainer.getCPtr(values)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public ActorContainer GetRange(int index, int count) { + public ViewContainer GetRange(int index, int count) { global::System.IntPtr cPtr = NDalicPINVOKE.ActorContainer_GetRange(swigCPtr, index, count); - ActorContainer ret = (cPtr == global::System.IntPtr.Zero) ? null : new ActorContainer(cPtr, true); + ViewContainer ret = (cPtr == global::System.IntPtr.Zero) ? null : new ViewContainer(cPtr, true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public void Insert(int index, Actor x) { - NDalicPINVOKE.ActorContainer_Insert(swigCPtr, index, Actor.getCPtr(x)); + public void Insert(int index, View x) { + NDalicPINVOKE.ActorContainer_Insert(swigCPtr, index, View.getCPtr(x)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void InsertRange(int index, ActorContainer values) { - NDalicPINVOKE.ActorContainer_InsertRange(swigCPtr, index, ActorContainer.getCPtr(values)); + public void InsertRange(int index, ViewContainer values) { + NDalicPINVOKE.ActorContainer_InsertRange(swigCPtr, index, ViewContainer.getCPtr(values)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -294,9 +295,9 @@ internal class ActorContainer : global::System.IDisposable, global::System.Colle if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public static ActorContainer Repeat(Actor value, int count) { - global::System.IntPtr cPtr = NDalicPINVOKE.ActorContainer_Repeat(Actor.getCPtr(value), count); - ActorContainer ret = (cPtr == global::System.IntPtr.Zero) ? null : new ActorContainer(cPtr, true); + public static ViewContainer Repeat(View value, int count) { + global::System.IntPtr cPtr = NDalicPINVOKE.ActorContainer_Repeat(View.getCPtr(value), count); + ViewContainer ret = (cPtr == global::System.IntPtr.Zero) ? null : new ViewContainer(cPtr, true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } @@ -311,8 +312,8 @@ internal class ActorContainer : global::System.IDisposable, global::System.Colle if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void SetRange(int index, ActorContainer values) { - NDalicPINVOKE.ActorContainer_SetRange(swigCPtr, index, ActorContainer.getCPtr(values)); + public void SetRange(int index, ViewContainer values) { + NDalicPINVOKE.ActorContainer_SetRange(swigCPtr, index, ViewContainer.getCPtr(values)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/src/Tizen.NUI/src/internal/ViewImpl.cs b/src/Tizen.NUI/src/internal/ViewImpl.cs index 6d73b61..f74a91a 100755 --- a/src/Tizen.NUI/src/internal/ViewImpl.cs +++ b/src/Tizen.NUI/src/internal/ViewImpl.cs @@ -33,7 +33,7 @@ namespace Tizen.NUI public override void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; @@ -243,15 +243,15 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - protected virtual new void OnChildAdd(Actor child) + protected virtual new void OnChildAdd(View child) { - if (SwigDerivedClassHasMethod("OnChildAdd", swigMethodTypes2)) NDalicPINVOKE.ViewImpl_OnChildAddSwigExplicitViewImpl(swigCPtr, Actor.getCPtr(child)); else NDalicPINVOKE.ViewImpl_OnChildAdd(swigCPtr, Actor.getCPtr(child)); + if (SwigDerivedClassHasMethod("OnChildAdd", swigMethodTypes2)) NDalicPINVOKE.ViewImpl_OnChildAddSwigExplicitViewImpl(swigCPtr, View.getCPtr(child)); else NDalicPINVOKE.ViewImpl_OnChildAdd(swigCPtr, View.getCPtr(child)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - protected virtual new void OnChildRemove(Actor child) + protected virtual new void OnChildRemove(View child) { - if (SwigDerivedClassHasMethod("OnChildRemove", swigMethodTypes3)) NDalicPINVOKE.ViewImpl_OnChildRemoveSwigExplicitViewImpl(swigCPtr, Actor.getCPtr(child)); else NDalicPINVOKE.ViewImpl_OnChildRemove(swigCPtr, Actor.getCPtr(child)); + if (SwigDerivedClassHasMethod("OnChildRemove", swigMethodTypes3)) NDalicPINVOKE.ViewImpl_OnChildRemoveSwigExplicitViewImpl(swigCPtr, View.getCPtr(child)); else NDalicPINVOKE.ViewImpl_OnChildRemove(swigCPtr, View.getCPtr(child)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -320,9 +320,9 @@ namespace Tizen.NUI return ret; } - protected virtual new float CalculateChildSize(Actor child, DimensionType dimension) + protected virtual new float CalculateChildSize(View child, DimensionType dimension) { - float ret = (SwigDerivedClassHasMethod("CalculateChildSize", swigMethodTypes14) ? NDalicPINVOKE.ViewImpl_CalculateChildSizeSwigExplicitViewImpl(swigCPtr, Actor.getCPtr(child), (int)dimension) : NDalicPINVOKE.ViewImpl_CalculateChildSize(swigCPtr, Actor.getCPtr(child), (int)dimension)); + float ret = (SwigDerivedClassHasMethod("CalculateChildSize", swigMethodTypes14) ? NDalicPINVOKE.ViewImpl_CalculateChildSizeSwigExplicitViewImpl(swigCPtr, View.getCPtr(child), (int)dimension) : NDalicPINVOKE.ViewImpl_CalculateChildSize(swigCPtr, View.getCPtr(child), (int)dimension)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } @@ -373,15 +373,15 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public virtual void OnControlChildAdd(Actor child) + public virtual void OnControlChildAdd(View child) { - if (SwigDerivedClassHasMethod("OnControlChildAdd", swigMethodTypes22)) NDalicPINVOKE.ViewImpl_OnControlChildAddSwigExplicitViewImpl(swigCPtr, Actor.getCPtr(child)); else NDalicPINVOKE.ViewImpl_OnControlChildAdd(swigCPtr, Actor.getCPtr(child)); + if (SwigDerivedClassHasMethod("OnControlChildAdd", swigMethodTypes22)) NDalicPINVOKE.ViewImpl_OnControlChildAddSwigExplicitViewImpl(swigCPtr, View.getCPtr(child)); else NDalicPINVOKE.ViewImpl_OnControlChildAdd(swigCPtr, View.getCPtr(child)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public virtual void OnControlChildRemove(Actor child) + public virtual void OnControlChildRemove(View child) { - if (SwigDerivedClassHasMethod("OnControlChildRemove", swigMethodTypes23)) NDalicPINVOKE.ViewImpl_OnControlChildRemoveSwigExplicitViewImpl(swigCPtr, Actor.getCPtr(child)); else NDalicPINVOKE.ViewImpl_OnControlChildRemove(swigCPtr, Actor.getCPtr(child)); + if (SwigDerivedClassHasMethod("OnControlChildRemove", swigMethodTypes23)) NDalicPINVOKE.ViewImpl_OnControlChildRemoveSwigExplicitViewImpl(swigCPtr, View.getCPtr(child)); else NDalicPINVOKE.ViewImpl_OnControlChildRemove(swigCPtr, View.getCPtr(child)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -438,16 +438,16 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public virtual Actor GetNextFocusableActor(Actor currentFocusedActor, View.FocusDirection direction, bool loopEnabled) + public virtual View GetNextFocusableView(View currentFocusedView, View.FocusDirection direction, bool loopEnabled) { - Actor ret = new Actor((SwigDerivedClassHasMethod("GetNextFocusableActor", swigMethodTypes32) ? NDalicPINVOKE.ViewImpl_GetNextKeyboardFocusableActorSwigExplicitViewImpl(swigCPtr, Actor.getCPtr(currentFocusedActor), (int)direction, loopEnabled) : NDalicPINVOKE.ViewImpl_GetNextKeyboardFocusableActor(swigCPtr, Actor.getCPtr(currentFocusedActor), (int)direction, loopEnabled)), true); + View ret = new View((SwigDerivedClassHasMethod("GetNextFocusableView", swigMethodTypes32) ? NDalicPINVOKE.ViewImpl_GetNextKeyboardFocusableActorSwigExplicitViewImpl(swigCPtr, View.getCPtr(currentFocusedView), (int)direction, loopEnabled) : NDalicPINVOKE.ViewImpl_GetNextKeyboardFocusableActor(swigCPtr, View.getCPtr(currentFocusedView), (int)direction, loopEnabled)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public virtual void OnFocusChangeCommitted(Actor commitedFocusableActor) + public virtual void OnFocusChangeCommitted(View commitedFocusableView) { - if (SwigDerivedClassHasMethod("OnFocusChangeCommitted", swigMethodTypes33)) NDalicPINVOKE.ViewImpl_OnKeyboardFocusChangeCommittedSwigExplicitViewImpl(swigCPtr, Actor.getCPtr(commitedFocusableActor)); else NDalicPINVOKE.ViewImpl_OnKeyboardFocusChangeCommitted(swigCPtr, Actor.getCPtr(commitedFocusableActor)); + if (SwigDerivedClassHasMethod("OnFocusChangeCommitted", swigMethodTypes33)) NDalicPINVOKE.ViewImpl_OnKeyboardFocusChangeCommittedSwigExplicitViewImpl(swigCPtr, View.getCPtr(commitedFocusableView)); else NDalicPINVOKE.ViewImpl_OnKeyboardFocusChangeCommitted(swigCPtr, View.getCPtr(commitedFocusableView)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -560,8 +560,8 @@ namespace Tizen.NUI swigDelegate30 = new SwigDelegateViewImpl_30(SwigDirectorOnKeyInputFocusGained); if (SwigDerivedClassHasMethod("OnKeyInputFocusLost", swigMethodTypes31)) swigDelegate31 = new SwigDelegateViewImpl_31(SwigDirectorOnKeyInputFocusLost); - if (SwigDerivedClassHasMethod("GetNextFocusableActor", swigMethodTypes32)) - swigDelegate32 = new SwigDelegateViewImpl_32(SwigDirectorGetNextKeyboardFocusableActor); + if (SwigDerivedClassHasMethod("GetNextFocusableView", swigMethodTypes32)) + swigDelegate32 = new SwigDelegateViewImpl_32(SwigDirectorGetNextKeyboardFocusableView); if (SwigDerivedClassHasMethod("OnFocusChangeCommitted", swigMethodTypes33)) swigDelegate33 = new SwigDelegateViewImpl_33(SwigDirectorOnKeyboardFocusChangeCommitted); if (SwigDerivedClassHasMethod("OnKeyboardEnter", swigMethodTypes34)) @@ -614,12 +614,12 @@ namespace Tizen.NUI private void SwigDirectorOnChildAdd(global::System.IntPtr child) { - OnChildAdd(new Actor(child, false)); + OnChildAdd(new View(child, false)); } private void SwigDirectorOnChildRemove(global::System.IntPtr child) { - OnChildRemove(new Actor(child, false)); + OnChildRemove(new View(child, false)); } private void SwigDirectorOnPropertySet(int index, global::System.IntPtr propertyValue) @@ -674,7 +674,7 @@ namespace Tizen.NUI private float SwigDirectorCalculateChildSize(global::System.IntPtr child, int dimension) { - return CalculateChildSize(new Actor(child, false), (DimensionType)dimension); + return CalculateChildSize(new View(child, false), (DimensionType)dimension); } private float SwigDirectorGetHeightForWidth(float width) @@ -714,12 +714,12 @@ namespace Tizen.NUI private void SwigDirectorOnControlChildAdd(global::System.IntPtr child) { - OnControlChildAdd(new Actor(child, false)); + OnControlChildAdd(new View(child, false)); } private void SwigDirectorOnControlChildRemove(global::System.IntPtr child) { - OnControlChildRemove(new Actor(child, false)); + OnControlChildRemove(new View(child, false)); } private void SwigDirectorOnStyleChange(global::System.IntPtr styleManager, int change) @@ -762,14 +762,14 @@ namespace Tizen.NUI OnKeyInputFocusLost(); } - private global::System.IntPtr SwigDirectorGetNextKeyboardFocusableActor(global::System.IntPtr currentFocusedActor, int direction, bool loopEnabled) + private global::System.IntPtr SwigDirectorGetNextKeyboardFocusableView(global::System.IntPtr currentFocusedView, int direction, bool loopEnabled) { - return Actor.getCPtr(GetNextFocusableActor(new Actor(currentFocusedActor, true), (View.FocusDirection)direction, loopEnabled)).Handle; + return View.getCPtr(GetNextFocusableView(new View(currentFocusedView, true), (View.FocusDirection)direction, loopEnabled)).Handle; } - private void SwigDirectorOnKeyboardFocusChangeCommitted(global::System.IntPtr commitedFocusableActor) + private void SwigDirectorOnKeyboardFocusChangeCommitted(global::System.IntPtr commitedFocusableView) { - OnFocusChangeCommitted(new Actor(commitedFocusableActor, true)); + OnFocusChangeCommitted(new View(commitedFocusableView, true)); } private bool SwigDirectorOnKeyboardEnter() @@ -893,8 +893,8 @@ namespace Tizen.NUI private static global::System.Type[] swigMethodTypes0 = new global::System.Type[] { typeof(int) }; private static global::System.Type[] swigMethodTypes1 = new global::System.Type[] { }; - private static global::System.Type[] swigMethodTypes2 = new global::System.Type[] { typeof(Actor) }; - private static global::System.Type[] swigMethodTypes3 = new global::System.Type[] { typeof(Actor) }; + private static global::System.Type[] swigMethodTypes2 = new global::System.Type[] { typeof(View) }; + private static global::System.Type[] swigMethodTypes3 = new global::System.Type[] { typeof(View) }; private static global::System.Type[] swigMethodTypes4 = new global::System.Type[] { typeof(int), typeof(PropertyValue) }; private static global::System.Type[] swigMethodTypes5 = new global::System.Type[] { typeof(Vector3) }; private static global::System.Type[] swigMethodTypes6 = new global::System.Type[] { typeof(Animation), typeof(Vector3) }; @@ -905,7 +905,7 @@ namespace Tizen.NUI private static global::System.Type[] swigMethodTypes11 = new global::System.Type[] { typeof(Vector2), typeof(RelayoutContainer) }; private static global::System.Type[] swigMethodTypes12 = new global::System.Type[] { typeof(ResizePolicyType), typeof(DimensionType) }; private static global::System.Type[] swigMethodTypes13 = new global::System.Type[] { }; - private static global::System.Type[] swigMethodTypes14 = new global::System.Type[] { typeof(Actor), typeof(DimensionType) }; + private static global::System.Type[] swigMethodTypes14 = new global::System.Type[] { typeof(View), typeof(DimensionType) }; private static global::System.Type[] swigMethodTypes15 = new global::System.Type[] { typeof(float) }; private static global::System.Type[] swigMethodTypes16 = new global::System.Type[] { typeof(float) }; private static global::System.Type[] swigMethodTypes17 = new global::System.Type[] { typeof(DimensionType) }; @@ -913,8 +913,8 @@ namespace Tizen.NUI private static global::System.Type[] swigMethodTypes19 = new global::System.Type[] { typeof(DimensionType) }; private static global::System.Type[] swigMethodTypes20 = new global::System.Type[] { typeof(float), typeof(DimensionType) }; private static global::System.Type[] swigMethodTypes21 = new global::System.Type[] { }; - private static global::System.Type[] swigMethodTypes22 = new global::System.Type[] { typeof(Actor) }; - private static global::System.Type[] swigMethodTypes23 = new global::System.Type[] { typeof(Actor) }; + private static global::System.Type[] swigMethodTypes22 = new global::System.Type[] { typeof(View) }; + private static global::System.Type[] swigMethodTypes23 = new global::System.Type[] { typeof(View) }; private static global::System.Type[] swigMethodTypes24 = new global::System.Type[] { typeof(StyleManager), typeof(StyleChangeType) }; private static global::System.Type[] swigMethodTypes25 = new global::System.Type[] { }; private static global::System.Type[] swigMethodTypes26 = new global::System.Type[] { typeof(PanGesture) }; @@ -923,8 +923,8 @@ namespace Tizen.NUI private static global::System.Type[] swigMethodTypes29 = new global::System.Type[] { }; private static global::System.Type[] swigMethodTypes30 = new global::System.Type[] { }; private static global::System.Type[] swigMethodTypes31 = new global::System.Type[] { }; - private static global::System.Type[] swigMethodTypes32 = new global::System.Type[] { typeof(Actor), typeof(View.FocusDirection), typeof(bool) }; - private static global::System.Type[] swigMethodTypes33 = new global::System.Type[] { typeof(Actor) }; + private static global::System.Type[] swigMethodTypes32 = new global::System.Type[] { typeof(View), typeof(View.FocusDirection), typeof(bool) }; + private static global::System.Type[] swigMethodTypes33 = new global::System.Type[] { typeof(View) }; private static global::System.Type[] swigMethodTypes34 = new global::System.Type[] { }; private static global::System.Type[] swigMethodTypes35 = new global::System.Type[] { typeof(PinchGesture) }; private static global::System.Type[] swigMethodTypes36 = new global::System.Type[] { typeof(PanGesture) }; diff --git a/src/Tizen.NUI/src/internal/ViewRegistry.cs b/src/Tizen.NUI/src/internal/ViewRegistry.cs index a97eb6c..b61ade5 100755 --- a/src/Tizen.NUI/src/internal/ViewRegistry.cs +++ b/src/Tizen.NUI/src/internal/ViewRegistry.cs @@ -227,7 +227,7 @@ namespace Tizen.NUI { // Create the control CustomView newControl = controlConstructor(); - return newControl.GetPtrfromActor(); // return pointer to handle + return newControl.GetPtrfromView(); // return pointer to handle } else { @@ -302,18 +302,18 @@ namespace Tizen.NUI } } - public static View GetViewFromActor(Actor actor) + public static View GetViewFromActor(View view) { // we store a dictionary of ref-obects (C++ land) to custom views (C# land) - RefObject refObj = actor.GetObjectPtr(); + RefObject refObj = view.GetObjectPtr(); IntPtr refObjectPtr = (IntPtr)RefObject.getCPtr(refObj); WeakReference viewReference; if (Instance._controlMap.TryGetValue(refObjectPtr, out viewReference)) { - View view = viewReference.Target as View; - return view; + View retview = viewReference.Target as View; + return retview; } else { diff --git a/src/Tizen.NUI/src/internal/ViewResourceReadySignal.cs b/src/Tizen.NUI/src/internal/ViewResourceReadySignal.cs new file mode 100755 index 0000000..1f1a92f --- /dev/null +++ b/src/Tizen.NUI/src/internal/ViewResourceReadySignal.cs @@ -0,0 +1,89 @@ +//------------------------------------------------------------------------------ +// +// +// This file was automatically generated by SWIG (http://www.swig.org). +// Version 3.0.12 +// +// Do not make changes to this file unless you know what you are doing--modify +// the SWIG interface file instead. +//------------------------------------------------------------------------------ +using Tizen.NUI.BaseComponents; + +namespace Tizen.NUI { + +public class ViewResourceReadySignal : global::System.IDisposable { + private global::System.Runtime.InteropServices.HandleRef swigCPtr; + protected bool swigCMemOwn; + + internal ViewResourceReadySignal(global::System.IntPtr cPtr, bool cMemoryOwn) { + swigCMemOwn = cMemoryOwn; + swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); + } + + internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ViewResourceReadySignal obj) { + return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; + } + + ~ViewResourceReadySignal() { + DisposeQueue.Instance.Add(this); + } + + public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + + lock(this) { + if (swigCPtr.Handle != global::System.IntPtr.Zero) { + if (swigCMemOwn) { + swigCMemOwn = false; + NDalicPINVOKE.delete_ViewResourceReadySignal(swigCPtr); + } + swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); + } + global::System.GC.SuppressFinalize(this); + } + } + + + public bool Empty() { + bool ret = NDalicPINVOKE.ViewResourceReadySignal_Empty(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public uint GetConnectionCount() { + uint ret = NDalicPINVOKE.ViewResourceReadySignal_GetConnectionCount(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public void Connect(System.Delegate func) { +System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func); + { + NDalicPINVOKE.ViewResourceReadySignal_Connect(swigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + } + + public void Disconnect(System.Delegate func) { +System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func); + { + NDalicPINVOKE.ViewResourceReadySignal_Disconnect(swigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + } + + public void Emit(View arg) { + NDalicPINVOKE.ViewResourceReadySignal_Emit(swigCPtr, View.getCPtr(arg)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public ViewResourceReadySignal() : this(NDalicPINVOKE.new_ViewResourceReadySignal(), true) { + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + +} + +} diff --git a/src/Tizen.NUI/src/internal/ActorSignal.cs b/src/Tizen.NUI/src/internal/ViewSignal.cs similarity index 86% rename from src/Tizen.NUI/src/internal/ActorSignal.cs rename to src/Tizen.NUI/src/internal/ViewSignal.cs index 3720a95..e6e02c2 100755 --- a/src/Tizen.NUI/src/internal/ActorSignal.cs +++ b/src/Tizen.NUI/src/internal/ViewSignal.cs @@ -2,33 +2,33 @@ // // // This file was automatically generated by SWIG (http://www.swig.org). -// Version 3.0.9 +// Version 3.0.10 // // Do not make changes to this file unless you know what you are doing--modify // the SWIG interface file instead. //------------------------------------------------------------------------------ namespace Tizen.NUI { - -internal class ActorSignal : global::System.IDisposable { + using Tizen.NUI.BaseComponents; + public class ViewSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; - internal ActorSignal(global::System.IntPtr cPtr, bool cMemoryOwn) { + internal ViewSignal(global::System.IntPtr cPtr, bool cMemoryOwn) { swigCMemOwn = cMemoryOwn; swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); } - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ActorSignal obj) { + internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ViewSignal obj) { return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; } - ~ActorSignal() { + ~ViewSignal() { DisposeQueue.Instance.Add(this); } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -74,12 +74,12 @@ System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForD } } - public void Emit(Actor arg) { - NDalicPINVOKE.ActorSignal_Emit(swigCPtr, Actor.getCPtr(arg)); + public void Emit(View arg) { + NDalicPINVOKE.ActorSignal_Emit(swigCPtr, View.getCPtr(arg)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public ActorSignal() : this(NDalicPINVOKE.new_ActorSignal(), true) { + public ViewSignal() : this(NDalicPINVOKE.new_ActorSignal(), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/src/Tizen.NUI/src/internal/ViewVisibilityChangedSignal.cs b/src/Tizen.NUI/src/internal/ViewVisibilityChangedSignal.cs new file mode 100755 index 0000000..2511be0 --- /dev/null +++ b/src/Tizen.NUI/src/internal/ViewVisibilityChangedSignal.cs @@ -0,0 +1,87 @@ +//------------------------------------------------------------------------------ +// +// +// This file was automatically generated by SWIG (http://www.swig.org). +// Version 3.0.12 +// +// Do not make changes to this file unless you know what you are doing--modify +// the SWIG interface file instead. +//------------------------------------------------------------------------------ +using Tizen.NUI.BaseComponents; +namespace Tizen.NUI { + +public class ViewVisibilityChangedSignal : global::System.IDisposable { + private global::System.Runtime.InteropServices.HandleRef swigCPtr; + protected bool swigCMemOwn; + + internal ViewVisibilityChangedSignal(global::System.IntPtr cPtr, bool cMemoryOwn) { + swigCMemOwn = cMemoryOwn; + swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); + } + + internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ViewVisibilityChangedSignal obj) { + return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; + } + + ~ViewVisibilityChangedSignal() { + DisposeQueue.Instance.Add(this); + } + + public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + + lock(this) { + if (swigCPtr.Handle != global::System.IntPtr.Zero) { + if (swigCMemOwn) { + swigCMemOwn = false; + NDalicPINVOKE.delete_ViewVisibilityChangedSignal(swigCPtr); + } + swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); + } + global::System.GC.SuppressFinalize(this); + } + } + + public bool Empty() { + bool ret = NDalicPINVOKE.ViewVisibilityChangedSignal_Empty(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public uint GetConnectionCount() { + uint ret = NDalicPINVOKE.ViewVisibilityChangedSignal_GetConnectionCount(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public void Connect(System.Delegate func) { +System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func); + { + NDalicPINVOKE.ViewVisibilityChangedSignal_Connect(swigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + } + + public void Disconnect(System.Delegate func) { +System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func); + { + NDalicPINVOKE.ViewVisibilityChangedSignal_Disconnect(swigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + } + + public void Emit(View arg) { + NDalicPINVOKE.ViewVisibilityChangedSignal_Emit(swigCPtr, View.getCPtr(arg)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public ViewVisibilityChangedSignal() : this(NDalicPINVOKE.new_ViewVisibilityChangedSignal(), true) { + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + +} + +} diff --git a/src/Tizen.NUI/src/internal/ViewWrapper.cs b/src/Tizen.NUI/src/internal/ViewWrapper.cs index ddb8738..90b9112 100755 --- a/src/Tizen.NUI/src/internal/ViewWrapper.cs +++ b/src/Tizen.NUI/src/internal/ViewWrapper.cs @@ -36,7 +36,7 @@ namespace Tizen.NUI public override void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; diff --git a/src/Tizen.NUI/src/internal/ViewWrapperImpl.cs b/src/Tizen.NUI/src/internal/ViewWrapperImpl.cs index c240f38..ec06cad 100755 --- a/src/Tizen.NUI/src/internal/ViewWrapperImpl.cs +++ b/src/Tizen.NUI/src/internal/ViewWrapperImpl.cs @@ -22,8 +22,8 @@ namespace Tizen.NUI private global::System.Runtime.InteropServices.HandleRef swigCPtr; public delegate void OnStageConnectionDelegate(int depth); public delegate void OnStageDisconnectionDelegate(); - public delegate void OnChildAddDelegate(Actor actor); - public delegate void OnChildRemoveDelegate(Actor actor); + public delegate void OnChildAddDelegate(View view); + public delegate void OnChildRemoveDelegate(View view); public delegate void OnPropertySetDelegate(int index, PropertyValue propertyValue); public delegate void OnSizeSetDelegate(Vector3 targetSize); public delegate void OnSizeAnimationDelegate(Animation animation, Vector3 targetSize); @@ -34,15 +34,15 @@ namespace Tizen.NUI public delegate void OnRelayoutDelegate(Vector2 size, RelayoutContainer container); public delegate void OnSetResizePolicyDelegate(ResizePolicyType policy, DimensionType dimension); public delegate Size GetNaturalSizeDelegate(); - public delegate float CalculateChildSizeDelegate(Actor child, DimensionType dimension); + public delegate float CalculateChildSizeDelegate(View child, DimensionType dimension); public delegate float GetHeightForWidthDelegate(float width); public delegate float GetWidthForHeightDelegate(float height); public delegate bool RelayoutDependentOnChildrenDimensionDelegate(DimensionType dimension); public delegate bool RelayoutDependentOnChildrenDelegate(); public delegate void OnCalculateRelayoutSizeDelegate(DimensionType dimension); public delegate void OnLayoutNegotiatedDelegate(float size, DimensionType dimension); - public delegate void OnControlChildAddDelegate(Actor child); - public delegate void OnControlChildRemoveDelegate(Actor child); + public delegate void OnControlChildAddDelegate(View child); + public delegate void OnControlChildRemoveDelegate(View child); public delegate void OnStyleChangeDelegate(StyleManager styleManager, StyleChangeType change); public delegate bool OnAccessibilityActivatedDelegate(); public delegate bool OnAccessibilityPanDelegate(PanGesture gestures); @@ -110,7 +110,7 @@ namespace Tizen.NUI public override void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; @@ -164,9 +164,9 @@ namespace Tizen.NUI return ret; } - public float CalculateChildSizeBase(Actor child, DimensionType dimension) + public float CalculateChildSizeBase(View child, DimensionType dimension) { - float ret = NDalicManualPINVOKE.ViewWrapperImpl_CalculateChildSizeBase(swigCPtr, Actor.getCPtr(child), (int)dimension); + float ret = NDalicManualPINVOKE.ViewWrapperImpl_CalculateChildSizeBase(swigCPtr, View.getCPtr(child), (int)dimension); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } @@ -298,12 +298,12 @@ namespace Tizen.NUI private void DirectorOnChildAdd(global::System.IntPtr child) { - OnChildAdd(new Actor(child, false)); + OnChildAdd(new View(child, false)); } private void DirectorOnChildRemove(global::System.IntPtr child) { - OnChildRemove(new Actor(child, false)); + OnChildRemove(new View(child, false)); } private void DirectorOnPropertySet(int index, global::System.IntPtr propertyValue) @@ -361,7 +361,7 @@ namespace Tizen.NUI private float DirectorCalculateChildSize(global::System.IntPtr child, int dimension) { - return CalculateChildSize(new Actor(child, false), (DimensionType)dimension); + return CalculateChildSize(new View(child, false), (DimensionType)dimension); } private float DirectorGetHeightForWidth(float width) @@ -400,12 +400,12 @@ namespace Tizen.NUI private void DirectorOnControlChildAdd(global::System.IntPtr child) { - OnControlChildAdd(new Actor(child, false)); + OnControlChildAdd(new View(child, false)); } private void DirectorOnControlChildRemove(global::System.IntPtr child) { - OnControlChildRemove(new Actor(child, false)); + OnControlChildRemove(new View(child, false)); } private void DirectorOnStyleChange(global::System.IntPtr styleManager, int change) @@ -453,7 +453,7 @@ namespace Tizen.NUI private global::System.IntPtr DirectorGetNextFocusableActor(global::System.IntPtr currentFocusedActor, int direction, bool loopEnabled) { - return Actor.getCPtr(GetNextFocusableView(new View(currentFocusedActor, false), (View.FocusDirection)direction, loopEnabled)).Handle; + return View.getCPtr(GetNextFocusableView(new View(currentFocusedActor, false), (View.FocusDirection)direction, loopEnabled)).Handle; } private void DirectorOnFocusChangeCommitted(global::System.IntPtr commitedFocusableView) diff --git a/src/Tizen.NUI/src/internal/VisualTransformPolicyType.cs b/src/Tizen.NUI/src/internal/VisualTransformPolicyType.cs deleted file mode 100755 index 11ff2ef..0000000 --- a/src/Tizen.NUI/src/internal/VisualTransformPolicyType.cs +++ /dev/null @@ -1,20 +0,0 @@ -//------------------------------------------------------------------------------ -// -// -// This file was automatically generated by SWIG (http://www.swig.org). -// Version 3.0.12 -// -// Do not make changes to this file unless you know what you are doing--modify -// the SWIG interface file instead. -//------------------------------------------------------------------------------ - -/* moved to VisualMaps.cs -namespace Tizen.NUI { - -public enum VisualTransformPolicyType { - RELATIVE = 0, - ABSOLUTE = 1 -} - -} -*/ \ No newline at end of file diff --git a/src/Tizen.NUI/src/internal/VisualTransformPropertyType.cs b/src/Tizen.NUI/src/internal/VisualTransformPropertyType.cs deleted file mode 100755 index e57ac85..0000000 --- a/src/Tizen.NUI/src/internal/VisualTransformPropertyType.cs +++ /dev/null @@ -1,24 +0,0 @@ -//------------------------------------------------------------------------------ -// -// -// 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. -//------------------------------------------------------------------------------ - -/* moved to VisualMaps.cs -namespace Tizen.NUI { - -public enum VisualTransformPropertyType { - OFFSET, - SIZE, - ORIGIN, - ANCHOR_POINT, - OFFSET_POLICY, - SIZE_POLICY -} - -} -*/ \ No newline at end of file diff --git a/src/Tizen.NUI/src/internal/VoidSignal.cs b/src/Tizen.NUI/src/internal/VoidSignal.cs index 28805a0..d0736f9 100755 --- a/src/Tizen.NUI/src/internal/VoidSignal.cs +++ b/src/Tizen.NUI/src/internal/VoidSignal.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/ActorWheelSignal.cs b/src/Tizen.NUI/src/internal/WheelSignal.cs similarity index 85% rename from src/Tizen.NUI/src/internal/ActorWheelSignal.cs rename to src/Tizen.NUI/src/internal/WheelSignal.cs index a8dad29..6d61ba6 100755 --- a/src/Tizen.NUI/src/internal/ActorWheelSignal.cs +++ b/src/Tizen.NUI/src/internal/WheelSignal.cs @@ -2,33 +2,33 @@ // // // This file was automatically generated by SWIG (http://www.swig.org). -// Version 3.0.9 +// Version 3.0.10 // // Do not make changes to this file unless you know what you are doing--modify // the SWIG interface file instead. //------------------------------------------------------------------------------ namespace Tizen.NUI { - - internal class ActorWheelSignal : global::System.IDisposable { + using Tizen.NUI.BaseComponents; +internal class WheelSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; - internal ActorWheelSignal(global::System.IntPtr cPtr, bool cMemoryOwn) { + internal WheelSignal(global::System.IntPtr cPtr, bool cMemoryOwn) { swigCMemOwn = cMemoryOwn; swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); } - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ActorWheelSignal obj) { + internal static global::System.Runtime.InteropServices.HandleRef getCPtr(WheelSignal obj) { return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; } - ~ActorWheelSignal() { + ~WheelSignal() { DisposeQueue.Instance.Add(this); } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } @@ -74,13 +74,13 @@ System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForD } } - public bool Emit(Actor arg1, Wheel arg2) { - bool ret = NDalicPINVOKE.ActorWheelSignal_Emit(swigCPtr, Actor.getCPtr(arg1), Wheel.getCPtr(arg2)); + public bool Emit(View arg1, Wheel arg2) { + bool ret = NDalicPINVOKE.ActorWheelSignal_Emit(swigCPtr, View.getCPtr(arg1), Wheel.getCPtr(arg2)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public ActorWheelSignal() : this(NDalicPINVOKE.new_ActorWheelSignal(), true) { + public WheelSignal() : this(NDalicPINVOKE.new_ActorWheelSignal(), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/src/Tizen.NUI/src/internal/WindowFocusSignalType.cs b/src/Tizen.NUI/src/internal/WindowFocusSignalType.cs index af65ce0..7ca4b33 100755 --- a/src/Tizen.NUI/src/internal/WindowFocusSignalType.cs +++ b/src/Tizen.NUI/src/internal/WindowFocusSignalType.cs @@ -34,7 +34,7 @@ namespace Tizen.NUI public virtual void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; diff --git a/src/Tizen.NUI/src/internal/WrapModeType.cs b/src/Tizen.NUI/src/internal/WrapModeType.cs deleted file mode 100755 index e22022f..0000000 --- a/src/Tizen.NUI/src/internal/WrapModeType.cs +++ /dev/null @@ -1,20 +0,0 @@ -//------------------------------------------------------------------------------ -// -// -// 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 { -/* move to VisualMap.cs - internal enum WrapModeType { - DEFAULT = 0, - CLAMP_TO_EDGE, - REPEAT, - MIRRORED_REPEAT -} -*/ -} diff --git a/src/Tizen.NUI/src/internal/doublep.cs b/src/Tizen.NUI/src/internal/doublep.cs index b4c2b6f..2137adc 100755 --- a/src/Tizen.NUI/src/internal/doublep.cs +++ b/src/Tizen.NUI/src/internal/doublep.cs @@ -29,7 +29,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/floatp.cs b/src/Tizen.NUI/src/internal/floatp.cs index e184d1d..ed9963a 100755 --- a/src/Tizen.NUI/src/internal/floatp.cs +++ b/src/Tizen.NUI/src/internal/floatp.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/intp.cs b/src/Tizen.NUI/src/internal/intp.cs index 85142b0..6736e36 100755 --- a/src/Tizen.NUI/src/internal/intp.cs +++ b/src/Tizen.NUI/src/internal/intp.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/uintp.cs b/src/Tizen.NUI/src/internal/uintp.cs index a8f2db4..0e8137f 100755 --- a/src/Tizen.NUI/src/internal/uintp.cs +++ b/src/Tizen.NUI/src/internal/uintp.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/internal/ushortp.cs b/src/Tizen.NUI/src/internal/ushortp.cs index 43a9121..95f90e8 100755 --- a/src/Tizen.NUI/src/internal/ushortp.cs +++ b/src/Tizen.NUI/src/internal/ushortp.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/public/Actor.cs b/src/Tizen.NUI/src/public/Actor.cs deleted file mode 100755 index fd47c17..0000000 --- a/src/Tizen.NUI/src/public/Actor.cs +++ /dev/null @@ -1,2137 +0,0 @@ -// Copyright (c) 2017 Samsung Electronics Co., Ltd. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// 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 - - -namespace Tizen.NUI -{ - - using System; - using System.Runtime.InteropServices; - - /// - /// Actor is the primary object with which Dali applications interact.
- /// UI controls can be built by combining multiple actors.
- /// - public class Actor : Handle - { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - - internal Actor(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Actor_SWIGUpcast(cPtr), cMemoryOwn) - { - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Actor obj) - { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - /// - /// To make Actor instance be disposed. - /// - public override void Dispose() - { - if (!Stage.IsInstalled()) - { - DisposeQueue.Instance.Add(this); - return; - } - - lock (this) - { - if (swigCPtr.Handle != global::System.IntPtr.Zero) - { - if (swigCMemOwn) - { - swigCMemOwn = false; - NDalicPINVOKE.delete_Actor(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - global::System.GC.SuppressFinalize(this); - base.Dispose(); - } - } - - internal static Actor GetActorFromPtr(global::System.IntPtr cPtr) - { - Actor ret = new Actor(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal IntPtr GetPtrfromActor() - { - return (IntPtr)swigCPtr; - } - - /// - /// Retrieves the position of the Actor.
- /// The coordinates are relative to the Actor's parent.
- /// - public Position CurrentPosition - { - get - { - return GetCurrentPosition(); - } - } - - /// - /// Retrieves the size of the Actor.
- /// The coordinates are relative to the Actor's parent.
- /// - public Size CurrentSize - { - get - { - return GetCurrentSize(); - } - } - - /// - /// Retrieves the actor's parent.
- /// - public Actor Parent - { - get - { - return GetParent(); - } - } - - /// - /// Retrieves and sets the actor's opacity.
- /// - public float Opacity - { - get - { - float temp = 0.0f; - GetProperty(Actor.Property.COLOR_ALPHA).Get(ref temp); - return temp; - } - set - { - SetProperty(Actor.Property.COLOR_ALPHA, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Retrieves screen postion of actor's.
- /// - public Vector2 ScreenPosition - { - get - { - Vector2 temp = new Vector2(0.0f, 0.0f); - GetProperty(Actor.Property.SCREEN_POSITION).Get(temp); - return temp; - } - } - - /// - /// Determines whether the anchor point should be used to determine the position of the actor. - /// This is true by default. - /// - /// If false, then the top-left of the actor is used for the position. - /// Setting this to false will allow scaling or rotation around the anchor-point without affecting the actor's position. - /// - public bool PositionUsesAnchorPoint - { - get - { - bool temp = false; - if(this) GetProperty(Actor.Property.POSITION_USES_ANCHOR_POINT).Get(ref temp); - return temp; - } - set - { - if(this) SetProperty(Actor.Property.POSITION_USES_ANCHOR_POINT, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Queries whether the actor is connected to the Stage.
- /// When an actor is connected, it will be directly or indirectly parented to the root Actor.
- /// - public bool IsOnStage - { - get - { - return OnStage(); - } - } - - /// - /// Gets depth in the hierarchy for the actor. - /// - public int HierarchyDepth - { - get - { - return GetHierarchyDepth(); - } - } - - /// - /// Sets the sibling order of the actor so depth position can be defined within the same parent. - /// - /// - /// Note The initial value is 0. - /// Raise, Lower, RaiseToTop, LowerToBottom, RaiseAbove and LowerBelow will override the sibling order. - /// The values set by this Property will likely change. - /// - public int SiblingOrder - { - get - { - int temp = 0; - GetProperty(Actor.Property.SIBLING_ORDER).Get(ref temp); - return temp; - } - set - { - SetProperty(Actor.Property.SIBLING_ORDER, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Sets the size of an actor for width and height.
- /// Geometry can be scaled to fit within this area.
- /// This does not interfere with the actors scale factor.
- /// The actors default depth is the minimum of width & height.
- /// - public Size2D Size2D - { - get - { - Size temp = new Size(0.0f, 0.0f, 0.0f); - GetProperty(Actor.Property.SIZE).Get(temp); - return new Size2D(temp); - } - set - { - SetProperty(Actor.Property.SIZE, new PropertyValue(new Size(value))); - } - } - - /// - /// Sets the position of the Actor for X and Y.
- /// By default, sets the position vector between the parent origin and anchor point(default).
- /// If Position inheritance if disabled, sets the world position.
- /// - public Position2D Position2D - { - get - { - Position temp = new Position(0.0f, 0.0f, 0.0f); - GetProperty(Actor.Property.POSITION).Get(temp); - return new Position2D(temp); - } - set - { - SetProperty(Actor.Property.POSITION, new PropertyValue(new Position(value))); - } - } - - /// - /// Shows the Actor. - /// - /// - /// This is an asynchronous method. - /// - public void Show() - { - SetVisible(true); - } - - /// - /// Hides the Actor. - /// - /// - /// This is an asynchronous method. - /// If an actor is hidden, then the actor and its children will not be rendered. - /// This is regardless of the individual visibility of the children i.e.an actor will only be rendered if all of its parents are shown. - /// - public void Hide() - { - SetVisible(false); - } - - /// - /// Raise actor above the next highest level of actor(s). - /// - /// - /// Sibling order of actors within the parent will be updated automatically. - /// Initially actors added to a parent will have the same sibling order and shown in relation to insertion order. - /// Raising this actor above actors with the same sibling order as each other will raise this actor above them. - /// Once a raise or lower API is used that actor will then have an exclusive sibling order independent of insertion. - /// - public void Raise() - { - NDalicPINVOKE.Raise(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - /// - /// Lower the actor to underneath the level below actor(s). - /// - /// - /// Sibling order of actors within the parent will be updated automatically. - /// Lowering this actor below actors with the same sibling order as each other will lower this actor above them. - /// Once a raise or lower API is used that actor will then have an exclusive sibling order independent of insertion. - /// - public void Lower() - { - NDalicPINVOKE.Lower(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - /// - /// Raise actor above all other actors. - /// - /// - /// Sibling order of actors within the parent will be updated automatically. - /// Once a raise or lower API is used that actor will then have an exclusive sibling order independent of insertion. - /// - public void RaiseToTop() - { - NDalicPINVOKE.RaiseToTop(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - /// - /// Lower actor to the bottom of all actors. - /// - /// - /// Sibling order of actors within the parent will be updated automatically. - /// Once a raise or lower API is used that actor will then have an exclusive sibling order independent of insertion. - /// - public void LowerToBottom() - { - NDalicPINVOKE.LowerToBottom(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - /// - /// Raise the actor to above the target actor. - /// - /// Sibling order of actors within the parent will be updated automatically. - /// Actors on the level above the target actor will still be shown above this actor. - /// Raising this actor above actors with the same sibling order as each other will raise this actor above them. - /// Once a raise or lower API is used that actor will then have an exclusive sibling order independent of insertion. - /// - /// Will be raised above this actor - public void RaiseAbove(Actor target) - { - NDalicPINVOKE.RaiseAbove(swigCPtr, Actor.getCPtr(target)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - /// - /// Lower the actor to below the target actor. - /// - /// Sibling order of actors within the parent will be updated automatically. - /// Lowering this actor below actors with the same sibling order as each other will lower this actor above them. - /// Once a raise or lower API is used that actor will then have an exclusive sibling order independent of insertion. - /// - /// Will be lowered below this actor - public void LowerBelow(Actor target) - { - NDalicPINVOKE.RaiseAbove(swigCPtr, Actor.getCPtr(target)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - - internal class Property : global::System.IDisposable - { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) - { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) - { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - ~Property() - { - Dispose(); - } - - public virtual void Dispose() - { - lock (this) - { - if (swigCPtr.Handle != global::System.IntPtr.Zero) - { - if (swigCMemOwn) - { - swigCMemOwn = false; - NDalicPINVOKE.delete_Actor_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - global::System.GC.SuppressFinalize(this); - } - } - - internal static readonly int SIBLING_ORDER = NDalicManualPINVOKE.Actor_Property_SIBLING_ORDER_get(); - internal static readonly int OPACITY = NDalicManualPINVOKE.Actor_Property_OPACITY_get(); - internal static readonly int SCREEN_POSITION = NDalicManualPINVOKE.Actor_Property_SCREEN_POSITION_get(); - internal static readonly int POSITION_USES_ANCHOR_POINT = NDalicManualPINVOKE.Actor_Property_POSITION_USES_ANCHOR_POINT_get(); - - internal Property() : this(NDalicPINVOKE.new_Actor_Property(), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal static readonly int PARENT_ORIGIN = NDalicPINVOKE.Actor_Property_PARENT_ORIGIN_get(); - internal static readonly int PARENT_ORIGIN_X = NDalicPINVOKE.Actor_Property_PARENT_ORIGIN_X_get(); - internal static readonly int PARENT_ORIGIN_Y = NDalicPINVOKE.Actor_Property_PARENT_ORIGIN_Y_get(); - internal static readonly int PARENT_ORIGIN_Z = NDalicPINVOKE.Actor_Property_PARENT_ORIGIN_Z_get(); - internal static readonly int ANCHOR_POINT = NDalicPINVOKE.Actor_Property_ANCHOR_POINT_get(); - internal static readonly int ANCHOR_POINT_X = NDalicPINVOKE.Actor_Property_ANCHOR_POINT_X_get(); - internal static readonly int ANCHOR_POINT_Y = NDalicPINVOKE.Actor_Property_ANCHOR_POINT_Y_get(); - internal static readonly int ANCHOR_POINT_Z = NDalicPINVOKE.Actor_Property_ANCHOR_POINT_Z_get(); - internal static readonly int SIZE = NDalicPINVOKE.Actor_Property_SIZE_get(); - internal static readonly int SIZE_WIDTH = NDalicPINVOKE.Actor_Property_SIZE_WIDTH_get(); - internal static readonly int SIZE_HEIGHT = NDalicPINVOKE.Actor_Property_SIZE_HEIGHT_get(); - internal static readonly int SIZE_DEPTH = NDalicPINVOKE.Actor_Property_SIZE_DEPTH_get(); - internal static readonly int POSITION = NDalicPINVOKE.Actor_Property_POSITION_get(); - internal static readonly int POSITION_X = NDalicPINVOKE.Actor_Property_POSITION_X_get(); - internal static readonly int POSITION_Y = NDalicPINVOKE.Actor_Property_POSITION_Y_get(); - internal static readonly int POSITION_Z = NDalicPINVOKE.Actor_Property_POSITION_Z_get(); - internal static readonly int WORLD_POSITION = NDalicPINVOKE.Actor_Property_WORLD_POSITION_get(); - internal static readonly int WORLD_POSITION_X = NDalicPINVOKE.Actor_Property_WORLD_POSITION_X_get(); - internal static readonly int WORLD_POSITION_Y = NDalicPINVOKE.Actor_Property_WORLD_POSITION_Y_get(); - internal static readonly int WORLD_POSITION_Z = NDalicPINVOKE.Actor_Property_WORLD_POSITION_Z_get(); - internal static readonly int ORIENTATION = NDalicPINVOKE.Actor_Property_ORIENTATION_get(); - internal static readonly int WORLD_ORIENTATION = NDalicPINVOKE.Actor_Property_WORLD_ORIENTATION_get(); - internal static readonly int SCALE = NDalicPINVOKE.Actor_Property_SCALE_get(); - internal static readonly int SCALE_X = NDalicPINVOKE.Actor_Property_SCALE_X_get(); - internal static readonly int SCALE_Y = NDalicPINVOKE.Actor_Property_SCALE_Y_get(); - internal static readonly int SCALE_Z = NDalicPINVOKE.Actor_Property_SCALE_Z_get(); - internal static readonly int WORLD_SCALE = NDalicPINVOKE.Actor_Property_WORLD_SCALE_get(); - internal static readonly int VISIBLE = NDalicPINVOKE.Actor_Property_VISIBLE_get(); - internal static readonly int COLOR = NDalicPINVOKE.Actor_Property_COLOR_get(); - internal static readonly int COLOR_RED = NDalicPINVOKE.Actor_Property_COLOR_RED_get(); - internal static readonly int COLOR_GREEN = NDalicPINVOKE.Actor_Property_COLOR_GREEN_get(); - internal static readonly int COLOR_BLUE = NDalicPINVOKE.Actor_Property_COLOR_BLUE_get(); - internal static readonly int COLOR_ALPHA = NDalicPINVOKE.Actor_Property_COLOR_ALPHA_get(); - internal static readonly int WORLD_COLOR = NDalicPINVOKE.Actor_Property_WORLD_COLOR_get(); - internal static readonly int WORLD_MATRIX = NDalicPINVOKE.Actor_Property_WORLD_MATRIX_get(); - internal static readonly int NAME = NDalicPINVOKE.Actor_Property_NAME_get(); - internal static readonly int SENSITIVE = NDalicPINVOKE.Actor_Property_SENSITIVE_get(); - internal static readonly int LEAVE_REQUIRED = NDalicPINVOKE.Actor_Property_LEAVE_REQUIRED_get(); - internal static readonly int INHERIT_ORIENTATION = NDalicPINVOKE.Actor_Property_INHERIT_ORIENTATION_get(); - internal static readonly int INHERIT_SCALE = NDalicPINVOKE.Actor_Property_INHERIT_SCALE_get(); - internal static readonly int COLOR_MODE = NDalicPINVOKE.Actor_Property_COLOR_MODE_get(); - internal static readonly int POSITION_INHERITANCE = NDalicPINVOKE.Actor_Property_POSITION_INHERITANCE_get(); - internal static readonly int DRAW_MODE = NDalicPINVOKE.Actor_Property_DRAW_MODE_get(); - internal static readonly int SIZE_MODE_FACTOR = NDalicPINVOKE.Actor_Property_SIZE_MODE_FACTOR_get(); - internal static readonly int WIDTH_RESIZE_POLICY = NDalicPINVOKE.Actor_Property_WIDTH_RESIZE_POLICY_get(); - internal static readonly int HEIGHT_RESIZE_POLICY = NDalicPINVOKE.Actor_Property_HEIGHT_RESIZE_POLICY_get(); - internal static readonly int SIZE_SCALE_POLICY = NDalicPINVOKE.Actor_Property_SIZE_SCALE_POLICY_get(); - internal static readonly int WIDTH_FOR_HEIGHT = NDalicPINVOKE.Actor_Property_WIDTH_FOR_HEIGHT_get(); - internal static readonly int HEIGHT_FOR_WIDTH = NDalicPINVOKE.Actor_Property_HEIGHT_FOR_WIDTH_get(); - internal static readonly int PADDING = NDalicPINVOKE.Actor_Property_PADDING_get(); - internal static readonly int MINIMUM_SIZE = NDalicPINVOKE.Actor_Property_MINIMUM_SIZE_get(); - internal static readonly int MAXIMUM_SIZE = NDalicPINVOKE.Actor_Property_MAXIMUM_SIZE_get(); - internal static readonly int INHERIT_POSITION = NDalicPINVOKE.Actor_Property_INHERIT_POSITION_get(); - internal static readonly int CLIPPING_MODE = NDalicPINVOKE.Actor_Property_CLIPPING_MODE_get(); - - } - - /// - /// Creates an initialized Actor. - /// - public Actor() : this(NDalicPINVOKE.Actor_New(), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - - } - - /// - /// Downcasts a handle to Actor handle.
- /// If handle points to an Actor object, the downcast produces valid handle.
- /// If not, the returned handle is left uninitialized.
- /// - /// handle to An object - /// handle to an Actor object or an uninitialized handle - public new static Actor DownCast(BaseHandle handle) - { - Actor ret = new Actor(NDalicPINVOKE.Actor_DownCast(BaseHandle.getCPtr(handle)), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal Actor(Actor copy) : this(NDalicPINVOKE.new_Actor__SWIG_1(Actor.getCPtr(copy)), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal Actor Assign(Actor rhs) - { - Actor ret = new Actor(NDalicPINVOKE.Actor_Assign(swigCPtr, Actor.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - 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(); - } - - internal uint GetId() - { - uint ret = NDalicPINVOKE.Actor_GetId(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal bool IsRoot() - { - bool ret = NDalicPINVOKE.Actor_IsRoot(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal bool OnStage() - { - bool ret = NDalicPINVOKE.Actor_OnStage(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal bool IsLayer() - { - bool ret = NDalicPINVOKE.Actor_IsLayer(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal Layer GetLayer() - { - Layer ret = new Layer(NDalicPINVOKE.Actor_GetLayer(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - /// - /// Adds a child Actor to this Actor. - /// - /// 
This Actor(the parent) has been initialized. The child actor has been initialized. The child actor is not the same as the parent actor.
- /// The child will be referenced by its parent. This means that the child will be kept alive, even if the handle passed into this method is reset or destroyed. - /// If the child already has a parent, it will be removed from old parent and reparented to this actor. This may change child's position, color, scale etc as it now inherits them from this actor. - /// The child - public void Add(Actor child) - { - NDalicPINVOKE.Actor_Add(swigCPtr, Actor.getCPtr(child)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - /// - /// Removes a child Actor from this Actor. If the actor was not a child of this actor, this is a no-op. - /// - /// 
This Actor(the parent) has been initialized. The child actor is not the same as the parent actor.
- /// The child - public void Remove(Actor child) - { - NDalicPINVOKE.Actor_Remove(swigCPtr, Actor.getCPtr(child)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal void Unparent() - { - NDalicPINVOKE.Actor_Unparent(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - /// - /// Retrieves the number of children held by the actor. - /// - /// 
The Actor has been initialized.
- /// The number of children - public uint GetChildCount() - { - uint ret = NDalicPINVOKE.Actor_GetChildCount(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - /// - /// Retrieves child actor by index. - /// - /// 
The Actor has been initialized.
- /// The index of the child to retrieve - /// The actor for the given index or empty handle if children not initialized - public Actor GetChildAt(uint index) - { - Actor ret = new Actor(NDalicPINVOKE.Actor_GetChildAt(swigCPtr, index), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - /// - /// Search through this actor's hierarchy for an actor with the given name. - /// The actor itself is also considered in the search. - /// - /// 
The Actor has been initialized.
- /// The name of the actor to find - /// A handle to the actor if found, or an empty handle if not - public Actor FindChildByName(string actorName) - { - Actor ret = new Actor(NDalicPINVOKE.Actor_FindChildByName(swigCPtr, actorName), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal Actor FindChildById(uint id) - { - Actor ret = new Actor(NDalicPINVOKE.Actor_FindChildById(swigCPtr, id), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal Actor GetParent() - { - Actor ret = new Actor(NDalicPINVOKE.Actor_GetParent(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal void SetParentOrigin(Vector3 origin) - { - NDalicPINVOKE.Actor_SetParentOrigin(swigCPtr, Vector3.getCPtr(origin)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal Vector3 GetCurrentParentOrigin() - { - Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetCurrentParentOrigin(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal void SetAnchorPoint(Vector3 anchorPoint) - { - NDalicPINVOKE.Actor_SetAnchorPoint(swigCPtr, Vector3.getCPtr(anchorPoint)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal Vector3 GetCurrentAnchorPoint() - { - Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetCurrentAnchorPoint(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal void SetSize(float width, float height) - { - NDalicPINVOKE.Actor_SetSize__SWIG_0(swigCPtr, width, height); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal void SetSize(float width, float height, float depth) - { - NDalicPINVOKE.Actor_SetSize__SWIG_1(swigCPtr, width, height, depth); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal void SetSize(Vector2 size) - { - NDalicPINVOKE.Actor_SetSize__SWIG_2(swigCPtr, Vector2.getCPtr(size)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal void SetSize(Vector3 size) - { - NDalicPINVOKE.Actor_SetSize__SWIG_3(swigCPtr, Vector3.getCPtr(size)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal Vector3 GetTargetSize() - { - Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetTargetSize(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal Size GetCurrentSize() - { - Size ret = new Size(NDalicPINVOKE.Actor_GetCurrentSize(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - /// - /// Returns the natural size of the actor.
- /// Deriving classes stipulate the natural size and by default an actor has a ZERO natural size.
- /// - /// The actor's natural size - public Vector3 GetNaturalSize() - { - Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetNaturalSize(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal void SetPosition(float x, float y) - { - NDalicPINVOKE.Actor_SetPosition__SWIG_0(swigCPtr, x, y); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal void SetPosition(float x, float y, float z) - { - NDalicPINVOKE.Actor_SetPosition__SWIG_1(swigCPtr, x, y, z); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal void SetPosition(Vector3 position) - { - NDalicPINVOKE.Actor_SetPosition__SWIG_2(swigCPtr, Vector3.getCPtr(position)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal void SetX(float x) - { - NDalicPINVOKE.Actor_SetX(swigCPtr, x); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal void SetY(float y) - { - NDalicPINVOKE.Actor_SetY(swigCPtr, y); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal void SetZ(float z) - { - NDalicPINVOKE.Actor_SetZ(swigCPtr, z); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal void TranslateBy(Vector3 distance) - { - NDalicPINVOKE.Actor_TranslateBy(swigCPtr, Vector3.getCPtr(distance)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal Position GetCurrentPosition() - { - Position ret = new Position(NDalicPINVOKE.Actor_GetCurrentPosition(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal Vector3 GetCurrentWorldPosition() - { - Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetCurrentWorldPosition(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal void SetInheritPosition(bool inherit) - { - NDalicPINVOKE.Actor_SetInheritPosition(swigCPtr, inherit); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal PositionInheritanceMode GetPositionInheritanceMode() - { - PositionInheritanceMode ret = (PositionInheritanceMode)NDalicPINVOKE.Actor_GetPositionInheritanceMode(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal bool IsPositionInherited() - { - bool ret = NDalicPINVOKE.Actor_IsPositionInherited(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal void SetOrientation(Degree angle, Vector3 axis) - { - NDalicPINVOKE.Actor_SetOrientation__SWIG_0(swigCPtr, Degree.getCPtr(angle), Vector3.getCPtr(axis)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal void SetOrientation(Radian angle, Vector3 axis) - { - NDalicPINVOKE.Actor_SetOrientation__SWIG_1(swigCPtr, Radian.getCPtr(angle), Vector3.getCPtr(axis)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal void SetOrientation(Rotation orientation) - { - NDalicPINVOKE.Actor_SetOrientation__SWIG_2(swigCPtr, Rotation.getCPtr(orientation)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal void RotateBy(Degree angle, Vector3 axis) - { - NDalicPINVOKE.Actor_RotateBy__SWIG_0(swigCPtr, Degree.getCPtr(angle), Vector3.getCPtr(axis)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal void RotateBy(Radian angle, Vector3 axis) - { - NDalicPINVOKE.Actor_RotateBy__SWIG_1(swigCPtr, Radian.getCPtr(angle), Vector3.getCPtr(axis)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal void RotateBy(Rotation relativeRotation) - { - NDalicPINVOKE.Actor_RotateBy__SWIG_2(swigCPtr, Rotation.getCPtr(relativeRotation)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal Rotation GetCurrentOrientation() - { - Rotation ret = new Rotation(NDalicPINVOKE.Actor_GetCurrentOrientation(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal void SetInheritOrientation(bool inherit) - { - NDalicPINVOKE.Actor_SetInheritOrientation(swigCPtr, inherit); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal bool IsOrientationInherited() - { - bool ret = NDalicPINVOKE.Actor_IsOrientationInherited(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal Rotation GetCurrentWorldOrientation() - { - Rotation ret = new Rotation(NDalicPINVOKE.Actor_GetCurrentWorldOrientation(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal void SetScale(float scale) - { - NDalicPINVOKE.Actor_SetScale__SWIG_0(swigCPtr, scale); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal void SetScale(float scaleX, float scaleY, float scaleZ) - { - NDalicPINVOKE.Actor_SetScale__SWIG_1(swigCPtr, scaleX, scaleY, scaleZ); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal void SetScale(Vector3 scale) - { - NDalicPINVOKE.Actor_SetScale__SWIG_2(swigCPtr, Vector3.getCPtr(scale)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal void ScaleBy(Vector3 relativeScale) - { - NDalicPINVOKE.Actor_ScaleBy(swigCPtr, Vector3.getCPtr(relativeScale)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal Vector3 GetCurrentScale() - { - Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetCurrentScale(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal Vector3 GetCurrentWorldScale() - { - Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetCurrentWorldScale(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal void SetInheritScale(bool inherit) - { - NDalicPINVOKE.Actor_SetInheritScale(swigCPtr, inherit); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal bool IsScaleInherited() - { - bool ret = NDalicPINVOKE.Actor_IsScaleInherited(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal Matrix GetCurrentWorldMatrix() - { - Matrix ret = new Matrix(NDalicPINVOKE.Actor_GetCurrentWorldMatrix(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal void SetVisible(bool visible) - { - NDalicPINVOKE.Actor_SetVisible(swigCPtr, visible); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal bool IsVisible() - { - bool ret = NDalicPINVOKE.Actor_IsVisible(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal void SetOpacity(float opacity) - { - NDalicPINVOKE.Actor_SetOpacity(swigCPtr, opacity); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal float GetCurrentOpacity() - { - float ret = NDalicPINVOKE.Actor_GetCurrentOpacity(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal void SetColor(Vector4 color) - { - NDalicPINVOKE.Actor_SetColor(swigCPtr, Vector4.getCPtr(color)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal Vector4 GetCurrentColor() - { - Vector4 ret = new Vector4(NDalicPINVOKE.Actor_GetCurrentColor(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal void SetColorMode(ColorMode colorMode) - { - NDalicPINVOKE.Actor_SetColorMode(swigCPtr, (int)colorMode); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal ColorMode GetColorMode() - { - ColorMode ret = (ColorMode)NDalicPINVOKE.Actor_GetColorMode(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal Vector4 GetCurrentWorldColor() - { - Vector4 ret = new Vector4(NDalicPINVOKE.Actor_GetCurrentWorldColor(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal void SetDrawMode(DrawModeType drawMode) - { - NDalicPINVOKE.Actor_SetDrawMode(swigCPtr, (int)drawMode); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal DrawModeType GetDrawMode() - { - DrawModeType ret = (DrawModeType)NDalicPINVOKE.Actor_GetDrawMode(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal void SetSensitive(bool sensitive) - { - NDalicPINVOKE.Actor_SetSensitive(swigCPtr, sensitive); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal bool IsSensitive() - { - bool ret = NDalicPINVOKE.Actor_IsSensitive(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - /// - /// Converts screen coordinates into the actor's coordinate system using the default camera. - /// - /// 
The Actor has been initialized.
- /// The actor coordinates are relative to the top-left(0.0, 0.0, 0.5) - /// On return, the X-coordinate relative to the actor - /// On return, the Y-coordinate relative to the actor - /// The screen X-coordinate - /// The screen Y-coordinate - /// True if the conversion succeeded - public bool ScreenToLocal(out float localX, out float localY, float screenX, float screenY) - { - bool ret = NDalicPINVOKE.Actor_ScreenToLocal(swigCPtr, out localX, out localY, screenX, screenY); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal void SetLeaveRequired(bool required) - { - NDalicPINVOKE.Actor_SetLeaveRequired(swigCPtr, required); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal bool GetLeaveRequired() - { - bool ret = NDalicPINVOKE.Actor_GetLeaveRequired(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal void SetKeyboardFocusable(bool focusable) - { - NDalicPINVOKE.Actor_SetKeyboardFocusable(swigCPtr, focusable); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal bool IsKeyboardFocusable() - { - bool ret = NDalicPINVOKE.Actor_IsKeyboardFocusable(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal void SetResizePolicy(ResizePolicyType policy, DimensionType dimension) - { - NDalicPINVOKE.Actor_SetResizePolicy(swigCPtr, (int)policy, (int)dimension); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal ResizePolicyType GetResizePolicy(DimensionType dimension) - { - ResizePolicyType ret = (ResizePolicyType)NDalicPINVOKE.Actor_GetResizePolicy(swigCPtr, (int)dimension); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal void SetSizeScalePolicy(SizeScalePolicyType policy) - { - NDalicPINVOKE.Actor_SetSizeScalePolicy(swigCPtr, (int)policy); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal SizeScalePolicyType GetSizeScalePolicy() - { - SizeScalePolicyType ret = (SizeScalePolicyType)NDalicPINVOKE.Actor_GetSizeScalePolicy(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - /// - /// Sets the relative to parent size factor of the actor.
- /// This factor is only used when ResizePolicy is set to either: - /// ResizePolicy::SIZE_RELATIVE_TO_PARENT or ResizePolicy::SIZE_FIXED_OFFSET_FROM_PARENT.
- /// This actor's size is set to the actor's size multiplied by or added to this factor, depending on ResizePolicy.
- /// - /// 
The Actor has been initialized.
- /// A Vector3 representing the relative factor to be applied to each axis - public void SetSizeModeFactor(Vector3 factor) - { - NDalicPINVOKE.Actor_SetSizeModeFactor(swigCPtr, Vector3.getCPtr(factor)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal Vector3 GetSizeModeFactor() - { - Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetSizeModeFactor(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - /// - /// Calculates the height of the actor given a width.
- /// The natural size is used for default calculation.
- /// size 0 is treated as aspect ratio 1:1.
- /// - /// Width to use - /// The height based on the width - public float GetHeightForWidth(float width) - { - float ret = NDalicPINVOKE.Actor_GetHeightForWidth(swigCPtr, width); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - /// - /// Calculates the width of the actor given a height.
- /// The natural size is used for default calculation.
- /// size 0 is treated as aspect ratio 1:1.
- /// - /// Height to use - /// The width based on the height - public float GetWidthForHeight(float height) - { - float ret = NDalicPINVOKE.Actor_GetWidthForHeight(swigCPtr, height); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public float GetRelayoutSize(DimensionType dimension) - { - float ret = NDalicPINVOKE.Actor_GetRelayoutSize(swigCPtr, (int)dimension); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - /// - /// Sets the padding for use in layout.
- /// - /// Padding for the actor - public void SetPadding(PaddingType padding) - { - NDalicPINVOKE.Actor_SetPadding(swigCPtr, PaddingType.getCPtr(padding)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - /// - /// Returns the value of the padding.
- /// - /// The returned padding data - public void GetPadding(PaddingType paddingOut) - { - NDalicPINVOKE.Actor_GetPadding(swigCPtr, PaddingType.getCPtr(paddingOut)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal void SetMinimumSize(Vector2 size) - { - NDalicPINVOKE.Actor_SetMinimumSize(swigCPtr, Vector2.getCPtr(size)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal Vector2 GetMinimumSize() - { - Vector2 ret = new Vector2(NDalicPINVOKE.Actor_GetMinimumSize(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal void SetMaximumSize(Vector2 size) - { - NDalicPINVOKE.Actor_SetMaximumSize(swigCPtr, Vector2.getCPtr(size)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal Vector2 GetMaximumSize() - { - Vector2 ret = new Vector2(NDalicPINVOKE.Actor_GetMaximumSize(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal int GetHierarchyDepth() - { - int ret = NDalicPINVOKE.Actor_GetHierarchyDepth(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal uint AddRenderer(Renderer renderer) - { - uint ret = NDalicPINVOKE.Actor_AddRenderer(swigCPtr, Renderer.getCPtr(renderer)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal uint GetRendererCount() - { - uint ret = NDalicPINVOKE.Actor_GetRendererCount(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal Renderer GetRendererAt(uint index) - { - Renderer ret = new Renderer(NDalicPINVOKE.Actor_GetRendererAt(swigCPtr, index), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal void RemoveRenderer(Renderer renderer) - { - NDalicPINVOKE.Actor_RemoveRenderer__SWIG_0(swigCPtr, Renderer.getCPtr(renderer)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal void RemoveRenderer(uint index) - { - NDalicPINVOKE.Actor_RemoveRenderer__SWIG_1(swigCPtr, index); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal SWIGTYPE_p_Dali__SignalT_bool_fDali__Actor_Dali__TouchEvent_const_RF_t TouchedSignal() - { - SWIGTYPE_p_Dali__SignalT_bool_fDali__Actor_Dali__TouchEvent_const_RF_t ret = new SWIGTYPE_p_Dali__SignalT_bool_fDali__Actor_Dali__TouchEvent_const_RF_t(NDalicPINVOKE.Actor_TouchedSignal(swigCPtr), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal ActorTouchDataSignal TouchSignal() - { - ActorTouchDataSignal ret = new ActorTouchDataSignal(NDalicPINVOKE.Actor_TouchSignal(swigCPtr), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal ActorHoverSignal HoveredSignal() - { - ActorHoverSignal ret = new ActorHoverSignal(NDalicPINVOKE.Actor_HoveredSignal(swigCPtr), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal ActorWheelSignal WheelEventSignal() - { - ActorWheelSignal ret = new ActorWheelSignal(NDalicPINVOKE.Actor_WheelEventSignal(swigCPtr), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal ActorSignal OnStageSignal() - { - ActorSignal ret = new ActorSignal(NDalicPINVOKE.Actor_OnStageSignal(swigCPtr), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal ActorSignal OffStageSignal() - { - ActorSignal ret = new ActorSignal(NDalicPINVOKE.Actor_OffStageSignal(swigCPtr), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal ActorSignal OnRelayoutSignal() - { - ActorSignal ret = new ActorSignal(NDalicPINVOKE.Actor_OnRelayoutSignal(swigCPtr), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - /// - /// Gets/Sets the origin of an actor, within its parent's area.
- /// This is expressed in unit coordinates, such that (0.0, 0.0, 0.5) is the top-left corner of the parent, and(1.0, 1.0, 0.5) is the bottom-right corner.
- /// The default parent-origin is ParentOrigin.TopLeft (0.0, 0.0, 0.5).
- /// An actor's position is the distance between this origin, and the actor's anchor-point.
- /// - /// 
The Actor has been initialized.
- public Position ParentOrigin - { - get - { - Position temp = new Position(0.0f, 0.0f, 0.0f); - GetProperty(Actor.Property.PARENT_ORIGIN).Get(temp); - return temp; - } - set - { - SetProperty(Actor.Property.PARENT_ORIGIN, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Gets/Sets the anchor-point of an actor.
- /// This is expressed in unit coordinates, such that (0.0, 0.0, 0.5) is the top-left corner of the actor, and (1.0, 1.0, 0.5) is the bottom-right corner.
- /// The default anchor point is AnchorPoint.Center (0.5, 0.5, 0.5).
- /// An actor position is the distance between its parent-origin and this anchor-point.
- /// An actor's orientation is the rotation from its default orientation, the rotation is centered around its anchor-point.
- /// 
The Actor has been initialized.
- /// - public Position AnchorPoint - { - get - { - Position temp = new Position(0.0f, 0.0f, 0.0f); - GetProperty(Actor.Property.ANCHOR_POINT).Get(temp); - return temp; - } - set - { - SetProperty(Actor.Property.ANCHOR_POINT, new Tizen.NUI.PropertyValue(value)); - } - } - - - /// - /// Gets/Sets the size of an actor.
- /// Geometry can be scaled to fit within this area.
- /// This does not interfere with the actors scale factor.
- /// - public Size Size - { - get - { - Size temp = new Size(0.0f, 0.0f, 0.0f); - GetProperty(Actor.Property.SIZE).Get(temp); - return temp; - } - set - { - SetProperty(Actor.Property.SIZE, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Gets/Sets the size width of an actor. - /// - public float SizeWidth - { - get - { - float temp = 0.0f; - GetProperty(Actor.Property.SIZE_WIDTH).Get(ref temp); - return temp; - } - set - { - SetProperty(Actor.Property.SIZE_WIDTH, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Gets/Sets the size height of an actor. - /// - public float SizeHeight - { - get - { - float temp = 0.0f; - GetProperty(Actor.Property.SIZE_HEIGHT).Get(ref temp); - return temp; - } - set - { - SetProperty(Actor.Property.SIZE_HEIGHT, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Gets/Sets the size depth of an actor. - /// - public float SizeDepth - { - get - { - float temp = 0.0f; - GetProperty(Actor.Property.SIZE_DEPTH).Get(ref temp); - return temp; - } - set - { - SetProperty(Actor.Property.SIZE_DEPTH, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Gets/Sets the position of the Actor.
- /// By default, sets the position vector between the parent origin and anchor point(default).
- /// If Position inheritance if disabled, sets the world position.
- /// - public Position Position - { - get - { - Position temp = new Position(0.0f, 0.0f, 0.0f); - GetProperty(Actor.Property.POSITION).Get(temp); - return temp; - } - set - { - SetProperty(Actor.Property.POSITION, new Tizen.NUI.PropertyValue(value)); - } - } - - - /// - /// Gets/Sets the position x of the Actor. - /// - public float PositionX - { - get - { - float temp = 0.0f; - GetProperty(Actor.Property.POSITION_X).Get(ref temp); - return temp; - } - set - { - SetProperty(Actor.Property.POSITION_X, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Gets/Sets the position y of the Actor. - /// - public float PositionY - { - get - { - float temp = 0.0f; - GetProperty(Actor.Property.POSITION_Y).Get(ref temp); - return temp; - } - set - { - SetProperty(Actor.Property.POSITION_Y, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Gets/Sets the position z of the Actor. - /// - public float PositionZ - { - get - { - float temp = 0.0f; - GetProperty(Actor.Property.POSITION_Z).Get(ref temp); - return temp; - } - set - { - SetProperty(Actor.Property.POSITION_Z, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Gets/Sets the world position of the Actor. - /// - public Vector3 WorldPosition - { - get - { - Vector3 temp = new Vector3(0.0f, 0.0f, 0.0f); - GetProperty(Actor.Property.WORLD_POSITION).Get(temp); - return temp; - } - } - - /// - /// Gets/Sets the orientation of the Actor.
- /// An actor's orientation is the rotation from its default orientation, and the rotation is centered around its anchor-point.
- /// - /// This is an asynchronous method. - public Rotation Orientation - { - get - { - Rotation temp = new Rotation(); - GetProperty(Actor.Property.ORIENTATION).Get(temp); - return temp; - } - set - { - SetProperty(Actor.Property.ORIENTATION, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Gets/Sets the world orientation of the Actor.
- /// - public Rotation WorldOrientation - { - get - { - Rotation temp = new Rotation(); - GetProperty(Actor.Property.WORLD_ORIENTATION).Get(temp); - return temp; - } - } - - /// - /// Gets/Sets the scale factor applied to an actor.
- /// - public Vector3 Scale - { - get - { - Vector3 temp = new Vector3(0.0f, 0.0f, 0.0f); - GetProperty(Actor.Property.SCALE).Get(temp); - return temp; - } - set - { - SetProperty(Actor.Property.SCALE, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Gets/Sets the scale x factor applied to an actor. - /// - public float ScaleX - { - get - { - float temp = 0.0f; - GetProperty(Actor.Property.SCALE_X).Get(ref temp); - return temp; - } - set - { - SetProperty(Actor.Property.SCALE_X, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Gets/Sets the scale y factor applied to an actor. - /// - public float ScaleY - { - get - { - float temp = 0.0f; - GetProperty(Actor.Property.SCALE_Y).Get(ref temp); - return temp; - } - set - { - SetProperty(Actor.Property.SCALE_Y, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Gets/Sets the scale z factor applied to an actor. - /// - public float ScaleZ - { - get - { - float temp = 0.0f; - GetProperty(Actor.Property.SCALE_Z).Get(ref temp); - return temp; - } - set - { - SetProperty(Actor.Property.SCALE_Z, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Gets the world scale of Actor. - /// - public Vector3 WorldScale - { - get - { - Vector3 temp = new Vector3(0.0f, 0.0f, 0.0f); - GetProperty(Actor.Property.WORLD_SCALE).Get(temp); - return temp; - } - } - - /// - /// Retrieves the visibility flag of an actor. - /// - /// - /// If an actor is not visible, then the actor and its children will not be rendered. - /// This is regardless of the individual visibility values of the children i.e.an actor will only be rendered if all of its parents have visibility set to true. - /// - public bool Visible - { - get - { - bool temp = false; - GetProperty(Actor.Property.VISIBLE).Get(ref temp); - return temp; - } - /* only get is required : removed - set - { - SetProperty(Actor.Property.VISIBLE, new Tizen.NUI.PropertyValue(value)); - } - */ - } - - /* - public Color MixColor - { - get - { - Color temp = new Color(0.0f, 0.0f, 0.0f, 0.0f); - GetProperty(Actor.Property.COLOR).Get(temp); - return temp; - } - set - { - SetProperty(Actor.Property.COLOR, new Tizen.NUI.PropertyValue(value)); - } - } - */ - - /// - /// Gets/Sets the actor's mix color red. - /// - public float ColorRed - { - get - { - float temp = 0.0f; - GetProperty(Actor.Property.COLOR_RED).Get(ref temp); - return temp; - } - set - { - SetProperty(Actor.Property.COLOR_RED, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Gets/Sets the actor's mix color green. - /// - public float ColorGreen - { - get - { - float temp = 0.0f; - GetProperty(Actor.Property.COLOR_GREEN).Get(ref temp); - return temp; - } - set - { - SetProperty(Actor.Property.COLOR_GREEN, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Gets/Sets the actor's mix color blue - /// - public float ColorBlue - { - get - { - float temp = 0.0f; - GetProperty(Actor.Property.COLOR_BLUE).Get(ref temp); - return temp; - } - set - { - SetProperty(Actor.Property.COLOR_BLUE, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Gets/Sets the actor's mix color alpha. - /// - public float ColorAlpha - { - get - { - float temp = 0.0f; - GetProperty(Actor.Property.COLOR_ALPHA).Get(ref temp); - return temp; - } - set - { - SetProperty(Actor.Property.COLOR_ALPHA, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Gets the actor's world color. - /// - public Color WorldColor - { - get - { - Color temp = new Color(0.0f, 0.0f, 0.0f, 0.0f); - GetProperty(Actor.Property.WORLD_COLOR).Get(temp); - return temp; - } - } - - /// - /// Gets/Sets the Actor's name. - /// - public string Name - { - get - { - string temp; - GetProperty(Actor.Property.NAME).Get(out temp); - return temp; - } - set - { - SetProperty(Actor.Property.NAME, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Gets/Sets the status of whether an actor should emit touch or hover signals. - /// - public bool Sensitive - { - get - { - bool temp = false; - GetProperty(Actor.Property.SENSITIVE).Get(ref temp); - return temp; - } - set - { - SetProperty(Actor.Property.SENSITIVE, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Gets/Sets the status of whether the actor should receive a notification when touch or hover motion events leave the boundary of the actor. - /// - public bool LeaveRequired - { - get - { - bool temp = false; - GetProperty(Actor.Property.LEAVE_REQUIRED).Get(ref temp); - return temp; - } - set - { - SetProperty(Actor.Property.LEAVE_REQUIRED, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Gets/Sets the status of whether a child actor inherits it's parent's orientation. - /// - public bool InheritOrientation - { - get - { - bool temp = false; - GetProperty(Actor.Property.INHERIT_ORIENTATION).Get(ref temp); - return temp; - } - set - { - SetProperty(Actor.Property.INHERIT_ORIENTATION, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Gets/Sets the status of whether a child actor inherits it's parent's scale. - /// - public bool InheritScale - { - get - { - bool temp = false; - GetProperty(Actor.Property.INHERIT_SCALE).Get(ref temp); - return temp; - } - set - { - SetProperty(Actor.Property.INHERIT_SCALE, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Gets/Sets the actor's color mode.
- /// This specifies whether the Actor uses its own color, or inherits its parent color.
- /// The default is UseOwnMultiplyParentAlpha.
- /// - public ColorMode ColorMode - { - get - { - string temp; - if (GetProperty(Actor.Property.COLOR_MODE).Get(out temp) == false) - { -#if DEBUG_ON - Tizen.Log.Error("NUI", "ColorMode get error!"); -#endif - } - switch (temp) - { - case "USE_OWN_COLOR": - return ColorMode.UseOwnColor; - case "USE_PARENT_COLOR": - return ColorMode.UseParentColor; - case "USE_OWN_MULTIPLY_PARENT_COLOR": - return ColorMode.UseOwnMultiplyParentColor; - case "USE_OWN_MULTIPLY_PARENT_ALPHA": - return ColorMode.UseOwnMultiplyParentAlpha; - default: - return ColorMode.UseOwnMultiplyParentAlpha; - } - } - set - { - SetProperty(Actor.Property.COLOR_MODE, new Tizen.NUI.PropertyValue((int)value)); - } - } - - - /// - /// Gets/Sets the status of how the actor and its children should be drawn.
- /// Not all actors are renderable, but DrawMode can be inherited from any actor.
- /// If an object is in a 3D layer, it will be depth-tested against other objects in the world i.e. it may be obscured if other objects are in front.
- /// If DrawMode.Overlay2D is used, the actor and its children will be drawn as a 2D overlay.
- /// Overlay actors are drawn in a separate pass, after all non-overlay actors within the Layer.
- /// For overlay actors, the drawing order is with respect to tree levels of Actors, and depth-testing will not be used.
- /// - public DrawModeType DrawMode - { - get - { - string temp; - if (GetProperty(Actor.Property.DRAW_MODE).Get(out temp) == false) - { -#if DEBUG_ON - Tizen.Log.Error("NUI", "DrawMode get error!"); -#endif - } - switch (temp) - { - case "NORMAL": - return DrawModeType.Normal; - case "OVERLAY_2D": - return DrawModeType.Overlay2D; - case "STENCIL": - return DrawModeType.Stencil; - default: - return DrawModeType.Normal; - } - } - set - { - SetProperty(Actor.Property.DRAW_MODE, new Tizen.NUI.PropertyValue((int)value)); - } - } - - /// - /// Gets/Sets the relative to parent size factor of the actor.
- /// This factor is only used when ResizePolicyType is set to either: ResizePolicyType.SizeRelativeToParent or ResizePolicyType.SizeFixedOffsetFromParent.
- /// This actor's size is set to the actor's size multiplied by or added to this factor, depending on ResizePolicyType.
- /// - public Vector3 SizeModeFactor - { - get - { - Vector3 temp = new Vector3(0.0f, 0.0f, 0.0f); - GetProperty(Actor.Property.SIZE_MODE_FACTOR).Get(temp); - return temp; - } - set - { - SetProperty(Actor.Property.SIZE_MODE_FACTOR, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Gets/Sets the width resize policy to be used. - /// - public ResizePolicyType WidthResizePolicy - { - get - { - string temp; - if (GetProperty(Actor.Property.WIDTH_RESIZE_POLICY).Get(out temp) == false) - { -#if DEBUG_ON - Tizen.Log.Error("NUI", "WidthResizePolicy get error!"); -#endif - } - switch (temp) - { - case "FIXED": - return ResizePolicyType.Fixed; - case "USE_NATURAL_SIZE": - return ResizePolicyType.UseNaturalSize; - case "FILL_TO_PARENT": - return ResizePolicyType.FillToParent; - case "SIZE_RELATIVE_TO_PARENT": - return ResizePolicyType.SizeRelativeToParent; - case "SIZE_FIXED_OFFSET_FROM_PARENT": - return ResizePolicyType.SizeFixedOffsetFromParent; - case "FIT_TO_CHILDREN": - return ResizePolicyType.FitToChildren; - case "DIMENSION_DEPENDENCY": - return ResizePolicyType.DimensionDependency; - case "USE_ASSIGNED_SIZE": - return ResizePolicyType.UseAssignedSize; - default: - return ResizePolicyType.Fixed; - } - } - set - { - SetProperty(Actor.Property.WIDTH_RESIZE_POLICY, new Tizen.NUI.PropertyValue((int)value)); - } - } - - /// - /// Gets/Sets the height resize policy to be used. - /// - public ResizePolicyType HeightResizePolicy - { - get - { - string temp; - if (GetProperty(Actor.Property.HEIGHT_RESIZE_POLICY).Get(out temp) == false) - { -#if DEBUG_ON - Tizen.Log.Error("NUI", "HeightResizePolicy get error!"); -#endif - } - switch (temp) - { - case "FIXED": - return ResizePolicyType.Fixed; - case "USE_NATURAL_SIZE": - return ResizePolicyType.UseNaturalSize; - case "FILL_TO_PARENT": - return ResizePolicyType.FillToParent; - case "SIZE_RELATIVE_TO_PARENT": - return ResizePolicyType.SizeRelativeToParent; - case "SIZE_FIXED_OFFSET_FROM_PARENT": - return ResizePolicyType.SizeFixedOffsetFromParent; - case "FIT_TO_CHILDREN": - return ResizePolicyType.FitToChildren; - case "DIMENSION_DEPENDENCY": - return ResizePolicyType.DimensionDependency; - case "USE_ASSIGNED_SIZE": - return ResizePolicyType.UseAssignedSize; - default: - return ResizePolicyType.Fixed; - } - } - set - { - SetProperty(Actor.Property.HEIGHT_RESIZE_POLICY, new Tizen.NUI.PropertyValue((int)value)); - } - } - - /// - /// Gets/Sets the policy to use when setting size with size negotiation.
- /// Defaults to SizeScalePolicyType.UseSizeSet.
- /// - public SizeScalePolicyType SizeScalePolicy - { - get - { - string temp; - if (GetProperty(Actor.Property.SIZE_SCALE_POLICY).Get(out temp) == false) - { -#if DEBUG_ON - Tizen.Log.Error("NUI", "SizeScalePolicy get error!"); -#endif - } - switch (temp) - { - case "USE_SIZE_SET": - return SizeScalePolicyType.UseSizeSet; - case "FIT_WITH_ASPECT_RATIO": - return SizeScalePolicyType.FitWithAspectRatio; - case "FILL_WITH_ASPECT_RATIO": - return SizeScalePolicyType.FillWithAspectRatio; - default: - return SizeScalePolicyType.UseSizeSet; - } - } - set - { - string valueToString = ""; - switch (value) - { - case SizeScalePolicyType.UseSizeSet: - { - valueToString = "USE_SIZE_SET"; - break; - } - case SizeScalePolicyType.FitWithAspectRatio: - { - valueToString = "FIT_WITH_ASPECT_RATIO"; - break; - } - case SizeScalePolicyType.FillWithAspectRatio: - { - valueToString = "FILL_WITH_ASPECT_RATIO"; - break; - } - default: - { - valueToString = "USE_SIZE_SET"; - break; - } - } - SetProperty(Actor.Property.SIZE_SCALE_POLICY, new Tizen.NUI.PropertyValue(valueToString)); - } - } - - /// - /// Gets/Sets the status of whether the width size is dependent on height size. - /// - public bool WidthDependentOnHeight - { - get - { - bool temp = false; - GetProperty(Actor.Property.WIDTH_FOR_HEIGHT).Get(ref temp); - return temp; - } - set - { - SetProperty(Actor.Property.WIDTH_FOR_HEIGHT, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Gets/Sets the status of whether the height size is dependent on width size. - /// - public bool HeightDependentOnWidth - { - get - { - bool temp = false; - GetProperty(Actor.Property.HEIGHT_FOR_WIDTH).Get(ref temp); - return temp; - } - set - { - SetProperty(Actor.Property.HEIGHT_FOR_WIDTH, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Gets/Sets the padding for use in layout. - /// - public Vector4 Padding - { - get - { - Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f); - GetProperty(Actor.Property.PADDING).Get(temp); - return temp; - } - set - { - SetProperty(Actor.Property.PADDING, new Tizen.NUI.PropertyValue(value)); - } - } - - - /// - /// Gets/Sets the minimum size an actor can be assigned in size negotiation. - /// - public Size2D MinimumSize - { - get - { - Size2D temp = new Size2D(0, 0); - GetProperty(Actor.Property.MINIMUM_SIZE).Get(temp); - return temp; - } - set - { - SetProperty(Actor.Property.MINIMUM_SIZE, new Tizen.NUI.PropertyValue(value)); - } - } - - - /// - /// Gets/Sets the maximum size an actor can be assigned in size negotiation. - /// - public Size2D MaximumSize - { - get - { - Size2D temp = new Size2D(0, 0); - GetProperty(Actor.Property.MAXIMUM_SIZE).Get(temp); - return temp; - } - set - { - SetProperty(Actor.Property.MAXIMUM_SIZE, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Gets/Sets whether a child actor inherits it's parent's position.
- /// Default is to inherit.
- /// Switching this off means that using Position sets the actor's world position, i.e. translates from the world origin(0,0,0) to the anchor point of the actor.
- /// - public bool InheritPosition - { - get - { - bool temp = false; - GetProperty(Actor.Property.INHERIT_POSITION).Get(ref temp); - return temp; - } - set - { - SetProperty(Actor.Property.INHERIT_POSITION, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Gets/Sets clipping behavior(mode) of it's children. - /// - public ClippingModeType ClippingMode - { - get - { - string temp; - if (GetProperty(Actor.Property.CLIPPING_MODE).Get(out temp) == false) - { -#if DEBUG_ON - Tizen.Log.Error("NUI", "ClippingMode get error!"); -#endif - } - switch (temp) - { - case "DISABLED": - return ClippingModeType.Disabled; - case "CLIP_CHILDREN": - return ClippingModeType.ClipChildren; - default: - return ClippingModeType.Disabled; - } - } - set - { - SetProperty(Actor.Property.CLIPPING_MODE, new Tizen.NUI.PropertyValue((int)value)); - } - } - } -} diff --git a/src/Tizen.NUI/src/public/AlphaFunction.cs b/src/Tizen.NUI/src/public/AlphaFunction.cs index aa482cd..0f7b2a5 100755 --- a/src/Tizen.NUI/src/public/AlphaFunction.cs +++ b/src/Tizen.NUI/src/public/AlphaFunction.cs @@ -48,7 +48,7 @@ namespace Tizen.NUI /// public virtual void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; diff --git a/src/Tizen.NUI/src/public/Animation.cs b/src/Tizen.NUI/src/public/Animation.cs index 9e1bfe9..badb901 100755 --- a/src/Tizen.NUI/src/public/Animation.cs +++ b/src/Tizen.NUI/src/public/Animation.cs @@ -21,9 +21,10 @@ namespace Tizen.NUI using System; using System.Runtime.InteropServices; + using Tizen.NUI.BaseComponents; /// - /// Animation can be used to animate the properties of any number of objects, typically Actors.
+ /// Animation can be used to animate the properties of any number of objects, typically View.
/// If the "Finished" event is connected to a member function of an object, it must be disconnected before the object is destroyed.
/// This is typically done in the object destructor, and requires either the Animation handle to be stored.
/// The overall animation time is superseded by the values given in the animation time used when calling the AnimateTo(), AnimateBy(), AnimateBetween() and AnimatePath() methods.
@@ -48,7 +49,7 @@ namespace Tizen.NUI /// public override void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; @@ -369,7 +370,7 @@ namespace Tizen.NUI /// The target property to animate /// The property value will change by this amount /// The alpha function to apply - public void AnimateBy(Actor target, string property, object relativeValue, AlphaFunction alphaFunction = null) + public void AnimateBy(View target, string property, object relativeValue, AlphaFunction alphaFunction = null) { string _str1 = property.Substring(0, 1); string _str2 = property.Substring(1); @@ -413,7 +414,7 @@ namespace Tizen.NUI /// Start time of animation /// End time of animation /// The alpha function to apply - public void AnimateBy(Actor target, string property, object relativeValue, int startTime, int endTime, AlphaFunction alphaFunction = null) + public void AnimateBy(View target, string property, object relativeValue, int startTime, int endTime, AlphaFunction alphaFunction = null) { string _str1 = property.Substring(0, 1); string _str2 = property.Substring(1); @@ -457,7 +458,7 @@ namespace Tizen.NUI /// The target property to animate /// The destination value /// The alpha function to apply - public void AnimateTo(Actor target, string property, object destinationValue, AlphaFunction alphaFunction = null) + public void AnimateTo(View target, string property, object destinationValue, AlphaFunction alphaFunction = null) { string _str1 = property.Substring(0, 1); string _str2 = property.Substring(1); @@ -502,7 +503,7 @@ namespace Tizen.NUI /// Start time of animation /// End time of animation /// The alpha function to apply - public void AnimateTo(Actor target, string property, object destinationValue, int startTime, int endTime, AlphaFunction alphaFunction = null) + public void AnimateTo(View target, string property, object destinationValue, int startTime, int endTime, AlphaFunction alphaFunction = null) { string _str1 = property.Substring(0, 1); string _str2 = property.Substring(1); @@ -547,7 +548,7 @@ namespace Tizen.NUI /// The set of time/value pairs between which to animate /// The method used to interpolate between values /// The alpha function to apply - public void AnimateBetween(Actor target, string property, KeyFrames keyFrames, Interpolation interpolation = Interpolation.Linear, AlphaFunction alphaFunction = null) + public void AnimateBetween(View target, string property, KeyFrames keyFrames, Interpolation interpolation = Interpolation.Linear, AlphaFunction alphaFunction = null) { string _str1 = property.Substring(0, 1); string _str2 = property.Substring(1); @@ -580,7 +581,7 @@ namespace Tizen.NUI /// End time of animation in milli seconds /// The method used to interpolate between values /// The alpha function to apply - public void AnimateBetween(Actor target, string property, KeyFrames keyFrames, int startTime, int endTime, Interpolation interpolation = Interpolation.Linear, AlphaFunction alphaFunction = null) + public void AnimateBetween(View target, string property, KeyFrames keyFrames, int startTime, int endTime, Interpolation interpolation = Interpolation.Linear, AlphaFunction alphaFunction = null) { string _str1 = property.Substring(0, 1); string _str2 = property.Substring(1); @@ -604,47 +605,47 @@ namespace Tizen.NUI } /// - /// Animates an actor's position and orientation through a predefined path.
- /// The actor will rotate to orient the supplied forward vector with the path's tangent.
+ /// Animates an view's position and orientation through a predefined path.
+ /// The view will rotate to orient the supplied forward vector with the path's tangent.
/// If forward is the zero vector then no rotation will happen.
/// - /// The actor to animate + /// The view to animate /// It defines position and orientation /// The vector (in local space coordinate system) that will be oriented with the path's tangent direction /// The alpha function to apply - public void AnimatePath(Actor actor, Path path, Vector3 forward, AlphaFunction alphaFunction = null) + public void AnimatePath(View view, Path path, Vector3 forward, AlphaFunction alphaFunction = null) { if (alphaFunction == null) { - Animate(actor, path, forward); + Animate(view, path, forward); } else { - Animate(actor, path, forward, alphaFunction); + Animate(view, path, forward, alphaFunction); } } /// - /// Animates an actor's position and orientation through a predefined path.
- /// The actor will rotate to orient the supplied forward vector with the path's tangent.
+ /// Animates an view's position and orientation through a predefined path.
+ /// The view will rotate to orient the supplied forward vector with the path's tangent.
/// If forward is the zero vector then no rotation will happen.
/// - /// The actor to animate + /// The view to animate /// It defines position and orientation /// The vector (in local space coordinate system) that will be oriented with the path's tangent direction /// Start time of animation /// End time of animation /// The alpha function to apply - public void AnimatePath(Actor actor, Path path, Vector3 forward, int startTime, int endTime, AlphaFunction alphaFunction = null) + public void AnimatePath(View view, Path path, Vector3 forward, int startTime, int endTime, AlphaFunction alphaFunction = null) { TimePeriod time = new TimePeriod(MilliSecondsToSeconds(startTime), MilliSecondsToSeconds(endTime - startTime)); if (alphaFunction == null) { - Animate(actor, path, forward, time); + Animate(view, path, forward, time); } else { - Animate(actor, path, forward, alphaFunction, time); + Animate(view, path, forward, alphaFunction, time); } } @@ -977,39 +978,39 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal void Animate(Actor actor, Path path, Vector3 forward) + internal void Animate(View view, Path path, Vector3 forward) { - NDalicPINVOKE.Animation_Animate__SWIG_0(swigCPtr, Actor.getCPtr(actor), Path.getCPtr(path), Vector3.getCPtr(forward)); + NDalicPINVOKE.Animation_Animate__SWIG_0(swigCPtr, View.getCPtr(view), Path.getCPtr(path), Vector3.getCPtr(forward)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal void Animate(Actor actor, Path path, Vector3 forward, AlphaFunction alpha) + internal void Animate(View view, Path path, Vector3 forward, AlphaFunction alpha) { - NDalicPINVOKE.Animation_Animate__SWIG_1(swigCPtr, Actor.getCPtr(actor), Path.getCPtr(path), Vector3.getCPtr(forward), AlphaFunction.getCPtr(alpha)); + NDalicPINVOKE.Animation_Animate__SWIG_1(swigCPtr, View.getCPtr(view), Path.getCPtr(path), Vector3.getCPtr(forward), AlphaFunction.getCPtr(alpha)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal void Animate(Actor actor, Path path, Vector3 forward, TimePeriod period) + internal void Animate(View view, Path path, Vector3 forward, TimePeriod period) { - NDalicPINVOKE.Animation_Animate__SWIG_2(swigCPtr, Actor.getCPtr(actor), Path.getCPtr(path), Vector3.getCPtr(forward), TimePeriod.getCPtr(period)); + NDalicPINVOKE.Animation_Animate__SWIG_2(swigCPtr, View.getCPtr(view), Path.getCPtr(path), Vector3.getCPtr(forward), TimePeriod.getCPtr(period)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal void Animate(Actor actor, Path path, Vector3 forward, AlphaFunction alpha, TimePeriod period) + internal void Animate(View view, Path path, Vector3 forward, AlphaFunction alpha, TimePeriod period) { - NDalicPINVOKE.Animation_Animate__SWIG_3(swigCPtr, Actor.getCPtr(actor), Path.getCPtr(path), Vector3.getCPtr(forward), AlphaFunction.getCPtr(alpha), TimePeriod.getCPtr(period)); + NDalicPINVOKE.Animation_Animate__SWIG_3(swigCPtr, View.getCPtr(view), Path.getCPtr(path), Vector3.getCPtr(forward), AlphaFunction.getCPtr(alpha), TimePeriod.getCPtr(period)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal void Show(Actor actor, float delaySeconds) + internal void Show(View view, float delaySeconds) { - NDalicPINVOKE.Animation_Show(swigCPtr, Actor.getCPtr(actor), delaySeconds); + NDalicPINVOKE.Animation_Show(swigCPtr, View.getCPtr(view), delaySeconds); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal void Hide(Actor actor, float delaySeconds) + internal void Hide(View view, float delaySeconds) { - NDalicPINVOKE.Animation_Hide(swigCPtr, Actor.getCPtr(actor), delaySeconds); + NDalicPINVOKE.Animation_Hide(swigCPtr, View.getCPtr(view), delaySeconds); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/src/Tizen.NUI/src/public/BaseComponents/CustomView.cs b/src/Tizen.NUI/src/public/BaseComponents/CustomView.cs index e29a27e..69585f5 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/CustomView.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/CustomView.cs @@ -72,7 +72,7 @@ namespace Tizen.NUI.BaseComponents // Set the StyleName the name of the View // We have to do this because the StyleManager on Native side can't workout it out - // This will also ensure that the style of actors/visuals initialized above are applied by the style manager. + // This will also ensure that the style of views/visuals initialized above are applied by the style manager. SetStyleName(this.GetType().Name); } @@ -107,7 +107,7 @@ namespace Tizen.NUI.BaseComponents /// /// Sets whether this control supports two dimensional keyboard navigation - /// (i.e. whether it knows how to handle the keyboard focus movement between its child actors).
+ /// (i.e. whether it knows how to handle the keyboard focus movement between its child views).
/// The control doesn't support it by default.
/// /// Whether this control supports two dimensional keyboard navigation. @@ -156,7 +156,7 @@ namespace Tizen.NUI.BaseComponents /// /// Sets whether this control is a focus group for keyboard navigation. - /// (i.e. the scope of keyboard focus movement can be limitied to its child actors). The control is not a focus group by default. + /// (i.e. the scope of keyboard focus movement can be limitied to its child views). The control is not a focus group by default. /// /// Whether this control is set as a focus group for keyboard navigation internal void SetAsKeyboardFocusGroup(bool isFocusGroup) @@ -199,7 +199,7 @@ namespace Tizen.NUI.BaseComponents } /// - /// Request a relayout, which means performing a size negotiation on this actor, its parent and children (and potentially whole scene).
+ /// Request a relayout, which means performing a size negotiation on this view, its parent and children (and potentially whole scene).
/// This method can also be called from a derived class every time it needs a different size.
/// At the end of event processing, the relayout process starts and all controls which requested Relayout will have their sizes (re)negotiated.
/// It can be called multiple times; the size negotiation is still only performed once, i.e. there is no need to keep track of this in the calling side.
@@ -210,7 +210,7 @@ namespace Tizen.NUI.BaseComponents } /// - /// Provides the Actor implementation of GetHeightForWidth. + /// Provides the View implementation of GetHeightForWidth. /// /// Width to use /// The height based on the width @@ -220,7 +220,7 @@ namespace Tizen.NUI.BaseComponents } /// - /// Provides the Actor implementation of GetWidthForHeight. + /// Provides the View implementation of GetWidthForHeight. /// /// Height to use /// The width based on the height @@ -230,38 +230,38 @@ namespace Tizen.NUI.BaseComponents } /// - /// Calculate the size for a child using the base actor object. + /// Calculate the size for a child using the base view object. /// - /// The child actor to calculate the size for + /// The child view to calculate the size for /// The dimension to calculate the size for. E.g. width or height /// Return the calculated size for the given dimension. If more than one dimension is requested, just return the first one found - protected float CalculateChildSizeBase(Actor child, DimensionType dimension) + protected float CalculateChildSizeBase(View child, DimensionType dimension) { return viewWrapperImpl.CalculateChildSizeBase(child, dimension); } /// - /// Determine if this actor is dependent on it's children for relayout from the base class. + /// Determine if this view is dependent on it's children for relayout from the base class. /// /// The dimension(s) to check for - /// Return if the actor is dependent on it's children + /// Return if the view is dependent on it's children protected bool RelayoutDependentOnChildrenBase(DimensionType dimension) { return viewWrapperImpl.RelayoutDependentOnChildrenBase(dimension); } /// - /// Determine if this actor is dependent on it's children for relayout from the base class. + /// Determine if this view is dependent on it's children for relayout from the base class. /// - /// Return if the actor is dependent on it's children + /// Return if the view is dependent on it's children protected bool RelayoutDependentOnChildrenBase() { return viewWrapperImpl.RelayoutDependentOnChildrenBase(); } /// - /// Register a visual by Property Index, linking an Actor to visual when required.
- /// In the case of the visual being an actor or control deeming visual not required then visual should be an empty handle.
+ /// Register a visual by Property Index, linking an View to visual when required.
+ /// In the case of the visual being an view or control deeming visual not required then visual should be an empty handle.
/// No parenting is done during registration, this should be done by derived class.
/// /// The Property index of the visual, used to reference visual @@ -272,8 +272,8 @@ namespace Tizen.NUI.BaseComponents } /// - /// Register a visual by Property Index, linking an Actor to visual when required.
- /// In the case of the visual being an actor or control deeming visual not required then visual should be an empty handle.
+ /// Register a visual by Property Index, linking an View to visual when required.
+ /// In the case of the visual being an view or control deeming visual not required then visual should be an empty handle.
/// If enabled is false then the visual is not set on stage until enabled by the derived class.
/// /// The Property index of the visual, used to reference visual @@ -355,43 +355,43 @@ namespace Tizen.NUI.BaseComponents } /// - /// Called after the actor has been connected to the stage.
- /// When an actor is connected, it will be directly or indirectly parented to the root Actor.
- /// The root Actor is provided automatically by Tizen.NUI.Stage, and is always considered to be connected.
- /// When the parent of a set of actors is connected to the stage, then all of the children will received this callback.
+ /// Called after the view has been connected to the stage.
+ /// When an view is connected, it will be directly or indirectly parented to the root View.
+ /// The root View is provided automatically by Tizen.NUI.Stage, and is always considered to be connected.
+ /// When the parent of a set of views is connected to the stage, then all of the children will received this callback.
/// - /// The depth in the hierarchy for the actor + /// The depth in the hierarchy for the view public virtual void OnStageConnection(int depth) { } /// - /// Called after the actor has been disconnected from Stage.
- /// If an actor is disconnected it either has no parent, or is parented to a disconnected actor.
- /// When the parent of a set of actors is disconnected to the stage, then all of the children will received this callback, starting with the leaf actors.
+ /// Called after the view has been disconnected from Stage.
+ /// If an view is disconnected it either has no parent, or is parented to a disconnected view.
+ /// When the parent of a set of views is disconnected to the stage, then all of the children will received this callback, starting with the leaf views.
/// public virtual void OnStageDisconnection() { } /// - /// Called after a child has been added to the owning actor. + /// Called after a child has been added to the owning view. /// - /// The child which has been added - public virtual void OnChildAdd(Actor actor) + /// The child which has been added + public virtual void OnChildAdd(View view) { } /// - /// Called after the owning actor has attempted to remove a child( regardless of whether it succeeded or not ). + /// Called after the owning view has attempted to remove a child( regardless of whether it succeeded or not ). /// - /// The child being removed - public virtual void OnChildRemove(Actor actor) + /// The child being removed + public virtual void OnChildRemove(View view) { } /// - /// Called when the owning actor property is set. + /// Called when the owning view property is set. /// /// The Property index that was set /// The value to set @@ -400,24 +400,24 @@ namespace Tizen.NUI.BaseComponents } /// - /// Called when the owning actor's size is set e.g. using Actor.SetSize(). + /// Called when the owning view's size is set e.g. using View.SetSize(). /// - /// The target size. Note that this target size may not match the size returned via Actor.GetTargetSize + /// The target size. Note that this target size may not match the size returned via View.GetTargetSize public virtual void OnSizeSet(Vector3 targetSize) { } /// - /// Called when the owning actor's size is animated e.g. using Animation::AnimateTo( Property( actor, Actor::Property::SIZE ), ... ). + /// Called when the owning view's size is animated e.g. using Animation::AnimateTo( Property( view, View::Property::SIZE ), ... ). /// - /// The object which is animating the owning actor - /// The target size. Note that this target size may not match the size returned via @ref Actor.GetTargetSize + /// The object which is animating the owning view + /// The target size. Note that this target size may not match the size returned via @ref View.GetTargetSize public virtual void OnSizeAnimation(Animation animation, Vector3 targetSize) { } /// - /// Called after a touch-event is received by the owning actor.
+ /// Called after a touch-event is received by the owning view.
/// CustomViewBehaviour.REQUIRES_TOUCH_EVENTS must be enabled during construction. See CustomView(ViewWrapperImpl.CustomViewBehaviour behaviour).
/// /// The touch event @@ -428,7 +428,7 @@ namespace Tizen.NUI.BaseComponents } /// - /// Called after a hover-event is received by the owning actor.
+ /// Called after a hover-event is received by the owning view.
/// CustomViewBehaviour.REQUIRES_HOVER_EVENTS must be enabled during construction. See CustomView(ViewWrapperImpl.CustomViewBehaviour behaviour).
/// /// The hover event @@ -439,7 +439,7 @@ namespace Tizen.NUI.BaseComponents } /// - /// Called after a key-event is received by the actor that has had its focus set. + /// Called after a key-event is received by the view that has had its focus set. /// /// The key event /// True if the key event should be consumed @@ -449,7 +449,7 @@ namespace Tizen.NUI.BaseComponents } /// - /// Called after a wheel-event is received by the owning actor.
+ /// Called after a wheel-event is received by the owning view.
/// CustomViewBehaviour.REQUIRES_WHEEL_EVENTS must be enabled during construction. See CustomView(ViewWrapperImpl.CustomViewBehaviour behaviour).
/// /// The wheel event @@ -462,11 +462,11 @@ namespace Tizen.NUI.BaseComponents /// /// Called after the size negotiation has been finished for this control.
/// The control is expected to assign this given size to itself/its children.
- /// Should be overridden by derived classes if they need to layout actors differently after certain operations like add or remove actors, resize or after changing specific properties.
+ /// Should be overridden by derived classes if they need to layout views differently after certain operations like add or remove views, resize or after changing specific properties.
/// As this function is called from inside the size negotiation algorithm, you cannot call RequestRelayout (the call would just be ignored).
/// /// The allocated size - /// The control should add actors to this container that it is not able to allocate a size for + /// The control should add views to this container that it is not able to allocate a size for public virtual void OnRelayout(Vector2 size, RelayoutContainer container) { } @@ -481,9 +481,9 @@ namespace Tizen.NUI.BaseComponents } /// - /// Return the natural size of the actor. + /// Return the natural size of the view. /// - /// The actor's natural size + /// The view's natural size public virtual Size GetNaturalSize() { return new Size(0.0f, 0.0f, 0.0f); @@ -492,10 +492,10 @@ namespace Tizen.NUI.BaseComponents /// /// Calculate the size for a child. /// - /// The child actor to calculate the size for + /// The child view to calculate the size for /// The dimension to calculate the size for. E.g. width or height /// Return the calculated size for the given dimension. If more than one dimension is requested, just return the first one found. - public virtual float CalculateChildSize(Actor child, DimensionType dimension) + public virtual float CalculateChildSize(View child, DimensionType dimension) { return viewWrapperImpl.CalculateChildSizeBase(child, dimension); } @@ -523,19 +523,19 @@ namespace Tizen.NUI.BaseComponents } /// - /// Determine if this actor is dependent on it's children for relayout. + /// Determine if this view is dependent on it's children for relayout. /// /// The dimension(s) to check for - /// Return if the actor is dependent on it's children + /// Return if the view is dependent on it's children public virtual bool RelayoutDependentOnChildren(DimensionType dimension) { return viewWrapperImpl.RelayoutDependentOnChildrenBase(dimension); } /// - /// Determine if this actor is dependent on it's children for relayout from the base class. + /// Determine if this view is dependent on it's children for relayout from the base class. /// - /// Return true if the actor is dependent on it's children + /// Return true if the view is dependent on it's children public virtual bool RelayoutDependentOnChildren() { return viewWrapperImpl.RelayoutDependentOnChildrenBase(); @@ -632,23 +632,23 @@ namespace Tizen.NUI.BaseComponents } /// - /// Gets the next keyboard focusable actor in this control towards the given direction.
+ /// Gets the next keyboard focusable view in this control towards the given direction.
/// A control needs to override this function in order to support two dimensional keyboard navigation.
/// - /// The current focused actor + /// The current focused view /// The direction to move the focus towards /// Whether the focus movement should be looped within the control - /// the next keyboard focusable actor in this control or an empty handle if no actor can be focused + /// the next keyboard focusable view in this control or an empty handle if no view can be focused public virtual View GetNextFocusableView(View currentFocusedView, View.FocusDirection direction, bool loopEnabled) { return new View(); } /// - /// Informs this control that its chosen focusable actor will be focused.
- /// This allows the application to preform any actions if wishes before the focus is actually moved to the chosen actor.
+ /// Informs this control that its chosen focusable view will be focused.
+ /// This allows the application to preform any actions if wishes before the focus is actually moved to the chosen view.
/// - /// The commited focused actor + /// The commited focused view public virtual void OnFocusChangeCommitted(View commitedFocusableView) { } @@ -707,11 +707,11 @@ namespace Tizen.NUI.BaseComponents { } - private void OnControlChildAdd(Actor child) + private void OnControlChildAdd(View child) { } - private void OnControlChildRemove(Actor child) + private void OnControlChildRemove(View child) { } } diff --git a/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs b/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs index 8c38bac..98bad20 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs @@ -26,6 +26,8 @@ namespace Tizen.NUI.BaseComponents { + using System; + using System.Runtime.InteropServices; /// /// ImageView is a class for displaying an image resource.
@@ -45,9 +47,82 @@ namespace Tizen.NUI.BaseComponents return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; } + + /// + /// Event arguments of resource ready. + /// + public class ResourceReadyEventArgs : EventArgs + { + private View _view; + + /// + /// The view whose resource is ready. + /// + public View View + { + get + { + return _view; + } + set + { + _view = value; + } + } + } + + private EventHandler _resourceReadyEventHandler; + [UnmanagedFunctionPointer(CallingConvention.StdCall)] + private delegate void ResourceReadyEventCallbackType(IntPtr data); + private ResourceReadyEventCallbackType _resourceReadyEventCallback; + + /// + /// Event for ResourceReady signal which can be used to subscribe/unsubscribe the event handler.
+ /// This signal is emitted after all resources required by a control are loaded and ready.
+ /// Most resources are only loaded when the control is placed on stage.
+ /// + public event EventHandler ResourceReady + { + add + { + if (_resourceReadyEventHandler == null) + { + _resourceReadyEventCallback = OnResourceReady; + ResourceReadySignal(this).Connect(_resourceReadyEventCallback); + } + + _resourceReadyEventHandler += value; + } + + remove + { + _resourceReadyEventHandler -= value; + + if (_resourceReadyEventHandler == null && ResourceReadySignal(this).Empty() == false) + { + ResourceReadySignal(this).Disconnect(_resourceReadyEventCallback); + } + } + } + + // Callback for View ResourceReady signal + private void OnResourceReady(IntPtr data) + { + ResourceReadyEventArgs e = new ResourceReadyEventArgs(); + if(data != null) + { + e.View = View.GetViewFromPtr(data); + } + + if (_resourceReadyEventHandler != null) + { + _resourceReadyEventHandler(this, e); + } + } + public override void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; @@ -69,7 +144,6 @@ namespace Tizen.NUI.BaseComponents } } - internal class Property : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; @@ -88,11 +162,16 @@ namespace Tizen.NUI.BaseComponents ~Property() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock (this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) @@ -189,6 +268,26 @@ namespace Tizen.NUI.BaseComponents ANIMATABLE_PROPERTY_END_INDEX = PropertyRanges.ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX + 1000 } + + internal ViewResourceReadySignal ResourceReadySignal(View view) { + ViewResourceReadySignal ret = new ViewResourceReadySignal(NDalicPINVOKE.ResourceReadySignal(View.getCPtr(view)), false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + /// + /// Query if all resources required by a control are loaded and ready.
+ /// Most resources are only loaded when the control is placed on stage.
+ /// true if the resources are loaded and ready, false otherwise.
+ /// + public bool IsResourceReady() + { + bool ret = NDalicPINVOKE.IsResourceReady(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + /// /// ImageView ResourceUrl, type string /// diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs b/src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs index 51cf8e6..8f2a7a5 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs @@ -52,7 +52,7 @@ namespace Tizen.NUI.BaseComponents /// public override void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; @@ -170,11 +170,16 @@ namespace Tizen.NUI.BaseComponents ~Property() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock (this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) @@ -256,11 +261,16 @@ namespace Tizen.NUI.BaseComponents ~InputStyle() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock (this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextField.cs b/src/Tizen.NUI/src/public/BaseComponents/TextField.cs index aff20d2..3975a76 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/TextField.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/TextField.cs @@ -52,7 +52,7 @@ namespace Tizen.NUI.BaseComponents /// public override void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; @@ -235,11 +235,16 @@ namespace Tizen.NUI.BaseComponents ~Property() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock (this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) @@ -328,11 +333,16 @@ namespace Tizen.NUI.BaseComponents ~InputStyle() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock (this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs b/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs index 6b5e557..3794ec8 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs @@ -50,7 +50,7 @@ namespace Tizen.NUI.BaseComponents /// public override void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; @@ -91,11 +91,16 @@ namespace Tizen.NUI.BaseComponents ~Property() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock (this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) diff --git a/src/Tizen.NUI/src/public/BaseComponents/View.cs b/src/Tizen.NUI/src/public/BaseComponents/View.cs index 56543bb..a929f45 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/View.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/View.cs @@ -23,7 +23,7 @@ namespace Tizen.NUI.BaseComponents /// /// View is the base class for all views. /// - public class View : CustomActor + public class View : Animatable //CustomActor => Animatable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; @@ -45,15 +45,15 @@ namespace Tizen.NUI.BaseComponents ~View() { - //DisposeQueue.Instance.Add(this); + DisposeQueue.Instance.Add(this); // Unregister this instance of view from the view registry. ViewRegistry.UnregisterView(this); } - public override void Dispose() + public virtual void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled())//Stage=>Window { DisposeQueue.Instance.Add(this); return; @@ -71,7 +71,7 @@ namespace Tizen.NUI.BaseComponents swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); } global::System.GC.SuppressFinalize(this); - base.Dispose(); + //base.Dispose(); } } @@ -489,95 +489,195 @@ namespace Tizen.NUI.BaseComponents } - private EventHandler _onStageEventHandler; + private EventHandler _onWindowEventHandler; [UnmanagedFunctionPointer(CallingConvention.StdCall)] - private delegate void OnStageEventCallbackType(IntPtr control); - private OnStageEventCallbackType _onStageEventCallback; + private delegate void OnWindowEventCallbackType(IntPtr control); + private OnWindowEventCallbackType _onWindowEventCallback; /// - /// Event for OnStage signal which can be used to subscribe/unsubscribe the event handler.
- /// OnStage signal is emitted after the view has been connected to the stage.
+ /// Event for OnWindow signal which can be used to subscribe/unsubscribe the event handler.
+ /// OnWindow signal is emitted after the view has been connected to the Window.
/// - public event EventHandler OnStageEvent + public event EventHandler OnWindowEvent { add { - if (_onStageEventHandler == null) + if (_onWindowEventHandler == null) { - _onStageEventCallback = OnStage; - this.OnStageSignal().Connect(_onStageEventCallback); + _onWindowEventCallback = OnWindow; + this.OnWindowSignal().Connect(_onWindowEventCallback); } - _onStageEventHandler += value; + _onWindowEventHandler += value; } remove { - _onStageEventHandler -= value; + _onWindowEventHandler -= value; - if (_onStageEventHandler == null && OnStageSignal().Empty() == false) + if (_onWindowEventHandler == null && OnWindowSignal().Empty() == false) { - this.OnStageSignal().Disconnect(_onStageEventCallback); + this.OnWindowSignal().Disconnect(_onWindowEventCallback); } } } - // Callback for View OnStage signal - private void OnStage(IntPtr data) + // Callback for View OnWindow signal + private void OnWindow(IntPtr data) { - if (_onStageEventHandler != null) + if (_onWindowEventHandler != null) { - _onStageEventHandler(this, null); + _onWindowEventHandler(this, null); } } - private EventHandler _offStageEventHandler; + private EventHandler _offWindowEventHandler; [UnmanagedFunctionPointer(CallingConvention.StdCall)] - private delegate void OffStageEventCallbackType(IntPtr control); - private OffStageEventCallbackType _offStageEventCallback; + private delegate void OffWindowEventCallbackType(IntPtr control); + private OffWindowEventCallbackType _offWindowEventCallback; /// - /// Event for OffStage signal which can be used to subscribe/unsubscribe the event handler.
- /// OffStage signal is emitted after the view has been disconnected from the stage.
+ /// Event for OffWindow signal which can be used to subscribe/unsubscribe the event handler.
+ /// OffWindow signal is emitted after the view has been disconnected from the Window.
/// - public event EventHandler OffStageEvent + public event EventHandler OffWindowEvent { add { - if (_offStageEventHandler == null) + if (_offWindowEventHandler == null) { - _offStageEventCallback = OffStage; - this.OffStageSignal().Connect(_offStageEventCallback); + _offWindowEventCallback = OffWindow; + this.OffWindowSignal().Connect(_offWindowEventCallback); } - _offStageEventHandler += value; + _offWindowEventHandler += value; } remove { - _offStageEventHandler -= value; + _offWindowEventHandler -= value; - if (_offStageEventHandler == null && OffStageSignal().Empty() == false) + if (_offWindowEventHandler == null && OffWindowSignal().Empty() == false) { - this.OffStageSignal().Disconnect(_offStageEventCallback); + this.OffWindowSignal().Disconnect(_offWindowEventCallback); } } } - // Callback for View OffStage signal - private void OffStage(IntPtr data) + // Callback for View OffWindow signal + private void OffWindow(IntPtr data) { - if (_offStageEventHandler != null) + if (_offWindowEventHandler != null) { - _offStageEventHandler(this, null); + _offWindowEventHandler(this, null); } } + /// + /// Event arguments of visibility changed. + /// + public class VisibilityChangedEventArgs : EventArgs + { + private View _view; + private bool _visibility; + private VisibilityChangeType _type; + + /// + /// The view, or child of view, whose visibility has changed. + /// + public View View + { + get + { + return _view; + } + set + { + _view = value; + } + } + + /// + /// Whether the view is now visible or not. + /// + public bool Visibility + { + get + { + return _visibility; + } + set + { + _visibility = value; + } + } + + /// + /// Whether the view's visible property has changed or a parent's. + /// + public VisibilityChangeType Type + { + get + { + return _type; + } + set + { + _type = value; + } + } + } + + private EventHandler _visibilityChangedEventHandler; + [UnmanagedFunctionPointer(CallingConvention.StdCall)] + private delegate void VisibilityChangedEventCallbackType(IntPtr data, bool visibility, VisibilityChangeType type); + private VisibilityChangedEventCallbackType _visibilityChangedEventCallback; + + /// + /// Event for visibility change which can be used to subscribe/unsubscribe the event handler.
+ /// This signal is emitted when the visible property of this or a parent view is changed.
+ /// + public event EventHandler VisibilityChanged + { + add + { + if (_visibilityChangedEventHandler == null) + { + _visibilityChangedEventCallback = OnVisibilityChanged; + VisibilityChangedSignal(this).Connect(_visibilityChangedEventCallback); + } + + _visibilityChangedEventHandler += value; + } + remove + { + _visibilityChangedEventHandler -= value; + if (_visibilityChangedEventHandler == null && VisibilityChangedSignal(this).Empty() == false) + { + VisibilityChangedSignal(this).Disconnect(_visibilityChangedEventCallback); + } + } + } + // Callback for View visibility change signal + private void OnVisibilityChanged(IntPtr data, bool visibility, VisibilityChangeType type) + { + VisibilityChangedEventArgs e = new VisibilityChangedEventArgs(); + if (data != null) + { + e.View = View.GetViewFromPtr(data); + } + e.Visibility = visibility; + e.Type = type; + if (_visibilityChangedEventHandler != null) + { + _visibilityChangedEventHandler(this, e); + } + } internal static View GetViewFromPtr(global::System.IntPtr cPtr) { @@ -586,6 +686,11 @@ namespace Tizen.NUI.BaseComponents return ret; } + internal IntPtr GetPtrfromView() + { + return (IntPtr)swigCPtr; + } + internal class Property : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; @@ -604,11 +709,16 @@ namespace Tizen.NUI.BaseComponents ~Property() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock (this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) @@ -627,10 +737,10 @@ namespace Tizen.NUI.BaseComponents internal static readonly int TOOLTIP = NDalicManualPINVOKE.View_Property_TOOLTIP_get(); internal static readonly int STATE = NDalicManualPINVOKE.View_Property_STATE_get(); internal static readonly int SUB_STATE = NDalicManualPINVOKE.View_Property_SUB_STATE_get(); - internal static readonly int LEFT_FOCUSABLE_ACTOR_ID = NDalicManualPINVOKE.View_Property_LEFT_FOCUSABLE_ACTOR_ID_get(); - internal static readonly int RIGHT_FOCUSABLE_ACTOR_ID = NDalicManualPINVOKE.View_Property_RIGHT_FOCUSABLE_ACTOR_ID_get(); - internal static readonly int UP_FOCUSABLE_ACTOR_ID = NDalicManualPINVOKE.View_Property_UP_FOCUSABLE_ACTOR_ID_get(); - internal static readonly int DOWN_FOCUSABLE_ACTOR_ID = NDalicManualPINVOKE.View_Property_DOWN_FOCUSABLE_ACTOR_ID_get(); + internal static readonly int LEFT_FOCUSABLE_VIEW_ID = NDalicManualPINVOKE.View_Property_LEFT_FOCUSABLE_ACTOR_ID_get(); + internal static readonly int RIGHT_FOCUSABLE_VIEW_ID = NDalicManualPINVOKE.View_Property_RIGHT_FOCUSABLE_ACTOR_ID_get(); + internal static readonly int UP_FOCUSABLE_VIEW_ID = NDalicManualPINVOKE.View_Property_UP_FOCUSABLE_ACTOR_ID_get(); + internal static readonly int DOWN_FOCUSABLE_VIEW_ID = NDalicManualPINVOKE.View_Property_DOWN_FOCUSABLE_ACTOR_ID_get(); internal Property() : this(NDalicPINVOKE.new_View_Property(), true) { @@ -642,7 +752,64 @@ namespace Tizen.NUI.BaseComponents internal static readonly int BACKGROUND_IMAGE = NDalicPINVOKE.View_Property_BACKGROUND_IMAGE_get(); internal static readonly int KEY_INPUT_FOCUS = NDalicPINVOKE.View_Property_KEY_INPUT_FOCUS_get(); internal static readonly int BACKGROUND = NDalicPINVOKE.View_Property_BACKGROUND_get(); - + internal static readonly int SIBLING_ORDER = NDalicManualPINVOKE.Actor_Property_SIBLING_ORDER_get(); + internal static readonly int OPACITY = NDalicManualPINVOKE.Actor_Property_OPACITY_get(); + internal static readonly int SCREEN_POSITION = NDalicManualPINVOKE.Actor_Property_SCREEN_POSITION_get(); + internal static readonly int POSITION_USES_ANCHOR_POINT = NDalicManualPINVOKE.Actor_Property_POSITION_USES_ANCHOR_POINT_get(); + internal static readonly int PARENT_ORIGIN = NDalicPINVOKE.Actor_Property_PARENT_ORIGIN_get(); + internal static readonly int PARENT_ORIGIN_X = NDalicPINVOKE.Actor_Property_PARENT_ORIGIN_X_get(); + internal static readonly int PARENT_ORIGIN_Y = NDalicPINVOKE.Actor_Property_PARENT_ORIGIN_Y_get(); + internal static readonly int PARENT_ORIGIN_Z = NDalicPINVOKE.Actor_Property_PARENT_ORIGIN_Z_get(); + internal static readonly int ANCHOR_POINT = NDalicPINVOKE.Actor_Property_ANCHOR_POINT_get(); + internal static readonly int ANCHOR_POINT_X = NDalicPINVOKE.Actor_Property_ANCHOR_POINT_X_get(); + internal static readonly int ANCHOR_POINT_Y = NDalicPINVOKE.Actor_Property_ANCHOR_POINT_Y_get(); + internal static readonly int ANCHOR_POINT_Z = NDalicPINVOKE.Actor_Property_ANCHOR_POINT_Z_get(); + internal static readonly int SIZE = NDalicPINVOKE.Actor_Property_SIZE_get(); + internal static readonly int SIZE_WIDTH = NDalicPINVOKE.Actor_Property_SIZE_WIDTH_get(); + internal static readonly int SIZE_HEIGHT = NDalicPINVOKE.Actor_Property_SIZE_HEIGHT_get(); + internal static readonly int SIZE_DEPTH = NDalicPINVOKE.Actor_Property_SIZE_DEPTH_get(); + internal static readonly int POSITION = NDalicPINVOKE.Actor_Property_POSITION_get(); + internal static readonly int POSITION_X = NDalicPINVOKE.Actor_Property_POSITION_X_get(); + internal static readonly int POSITION_Y = NDalicPINVOKE.Actor_Property_POSITION_Y_get(); + internal static readonly int POSITION_Z = NDalicPINVOKE.Actor_Property_POSITION_Z_get(); + internal static readonly int WORLD_POSITION = NDalicPINVOKE.Actor_Property_WORLD_POSITION_get(); + internal static readonly int WORLD_POSITION_X = NDalicPINVOKE.Actor_Property_WORLD_POSITION_X_get(); + internal static readonly int WORLD_POSITION_Y = NDalicPINVOKE.Actor_Property_WORLD_POSITION_Y_get(); + internal static readonly int WORLD_POSITION_Z = NDalicPINVOKE.Actor_Property_WORLD_POSITION_Z_get(); + internal static readonly int ORIENTATION = NDalicPINVOKE.Actor_Property_ORIENTATION_get(); + internal static readonly int WORLD_ORIENTATION = NDalicPINVOKE.Actor_Property_WORLD_ORIENTATION_get(); + internal static readonly int SCALE = NDalicPINVOKE.Actor_Property_SCALE_get(); + internal static readonly int SCALE_X = NDalicPINVOKE.Actor_Property_SCALE_X_get(); + internal static readonly int SCALE_Y = NDalicPINVOKE.Actor_Property_SCALE_Y_get(); + internal static readonly int SCALE_Z = NDalicPINVOKE.Actor_Property_SCALE_Z_get(); + internal static readonly int WORLD_SCALE = NDalicPINVOKE.Actor_Property_WORLD_SCALE_get(); + internal static readonly int VISIBLE = NDalicPINVOKE.Actor_Property_VISIBLE_get(); + internal static readonly int COLOR = NDalicPINVOKE.Actor_Property_COLOR_get(); + internal static readonly int COLOR_RED = NDalicPINVOKE.Actor_Property_COLOR_RED_get(); + internal static readonly int COLOR_GREEN = NDalicPINVOKE.Actor_Property_COLOR_GREEN_get(); + internal static readonly int COLOR_BLUE = NDalicPINVOKE.Actor_Property_COLOR_BLUE_get(); + internal static readonly int COLOR_ALPHA = NDalicPINVOKE.Actor_Property_COLOR_ALPHA_get(); + internal static readonly int WORLD_COLOR = NDalicPINVOKE.Actor_Property_WORLD_COLOR_get(); + internal static readonly int WORLD_MATRIX = NDalicPINVOKE.Actor_Property_WORLD_MATRIX_get(); + internal static readonly int NAME = NDalicPINVOKE.Actor_Property_NAME_get(); + internal static readonly int SENSITIVE = NDalicPINVOKE.Actor_Property_SENSITIVE_get(); + internal static readonly int LEAVE_REQUIRED = NDalicPINVOKE.Actor_Property_LEAVE_REQUIRED_get(); + internal static readonly int INHERIT_ORIENTATION = NDalicPINVOKE.Actor_Property_INHERIT_ORIENTATION_get(); + internal static readonly int INHERIT_SCALE = NDalicPINVOKE.Actor_Property_INHERIT_SCALE_get(); + internal static readonly int COLOR_MODE = NDalicPINVOKE.Actor_Property_COLOR_MODE_get(); + internal static readonly int POSITION_INHERITANCE = NDalicPINVOKE.Actor_Property_POSITION_INHERITANCE_get(); + internal static readonly int DRAW_MODE = NDalicPINVOKE.Actor_Property_DRAW_MODE_get(); + internal static readonly int SIZE_MODE_FACTOR = NDalicPINVOKE.Actor_Property_SIZE_MODE_FACTOR_get(); + internal static readonly int WIDTH_RESIZE_POLICY = NDalicPINVOKE.Actor_Property_WIDTH_RESIZE_POLICY_get(); + internal static readonly int HEIGHT_RESIZE_POLICY = NDalicPINVOKE.Actor_Property_HEIGHT_RESIZE_POLICY_get(); + internal static readonly int SIZE_SCALE_POLICY = NDalicPINVOKE.Actor_Property_SIZE_SCALE_POLICY_get(); + internal static readonly int WIDTH_FOR_HEIGHT = NDalicPINVOKE.Actor_Property_WIDTH_FOR_HEIGHT_get(); + internal static readonly int HEIGHT_FOR_WIDTH = NDalicPINVOKE.Actor_Property_HEIGHT_FOR_WIDTH_get(); + internal static readonly int PADDING = NDalicPINVOKE.Actor_Property_PADDING_get(); + internal static readonly int MINIMUM_SIZE = NDalicPINVOKE.Actor_Property_MINIMUM_SIZE_get(); + internal static readonly int MAXIMUM_SIZE = NDalicPINVOKE.Actor_Property_MAXIMUM_SIZE_get(); + internal static readonly int INHERIT_POSITION = NDalicPINVOKE.Actor_Property_INHERIT_POSITION_get(); + internal static readonly int CLIPPING_MODE = NDalicPINVOKE.Actor_Property_CLIPPING_MODE_get(); } @@ -697,28 +864,28 @@ namespace Tizen.NUI.BaseComponents /// Downcasts a handle to class which inherit View handle. /// /// Class which inherit View - /// Actor to an object + /// View to an object /// A object which inherit View - public static T DownCast(Actor actor) where T : View + public static T DownCast(View view) where T : View { - return (T)(ViewRegistry.GetViewFromActor(actor)); + return (T)(ViewRegistry.GetViewFromActor(view)); } private View ConvertIdToView(uint id) { - Actor actor = null; + View view = null; if (Parent) { - actor = Parent.FindChildById(id); + view = Parent.FindChildById(id); } - if (!actor) + if (!view) { - actor = Stage.Instance.GetRootLayer().FindChildById(id); + view = Window.Instance.GetRootLayer().FindChildById(id); } - return View.DownCast(actor); + return view; } internal void SetKeyInputFocus() @@ -1076,59 +1243,59 @@ namespace Tizen.NUI.BaseComponents } } - private int LeftFocusableActorId + private int LeftFocusableViewId { get { int temp = 0; - GetProperty(View.Property.LEFT_FOCUSABLE_ACTOR_ID).Get(ref temp); + GetProperty(View.Property.LEFT_FOCUSABLE_VIEW_ID).Get(ref temp); return temp; } set { - SetProperty(View.Property.LEFT_FOCUSABLE_ACTOR_ID, new Tizen.NUI.PropertyValue(value)); + SetProperty(View.Property.LEFT_FOCUSABLE_VIEW_ID, new Tizen.NUI.PropertyValue(value)); } } - private int RightFocusableActorId + private int RightFocusableViewId { get { int temp = 0; - GetProperty(View.Property.RIGHT_FOCUSABLE_ACTOR_ID).Get(ref temp); + GetProperty(View.Property.RIGHT_FOCUSABLE_VIEW_ID).Get(ref temp); return temp; } set { - SetProperty(View.Property.RIGHT_FOCUSABLE_ACTOR_ID, new Tizen.NUI.PropertyValue(value)); + SetProperty(View.Property.RIGHT_FOCUSABLE_VIEW_ID, new Tizen.NUI.PropertyValue(value)); } } - private int UpFocusableActorId + private int UpFocusableViewId { get { int temp = 0; - GetProperty(View.Property.UP_FOCUSABLE_ACTOR_ID).Get(ref temp); + GetProperty(View.Property.UP_FOCUSABLE_VIEW_ID).Get(ref temp); return temp; } set { - SetProperty(View.Property.UP_FOCUSABLE_ACTOR_ID, new Tizen.NUI.PropertyValue(value)); + SetProperty(View.Property.UP_FOCUSABLE_VIEW_ID, new Tizen.NUI.PropertyValue(value)); } } - private int DownFocusableActorId + private int DownFocusableViewId { get { int temp = 0; - GetProperty(View.Property.DOWN_FOCUSABLE_ACTOR_ID).Get(ref temp); + GetProperty(View.Property.DOWN_FOCUSABLE_VIEW_ID).Get(ref temp); return temp; } set { - SetProperty(View.Property.DOWN_FOCUSABLE_ACTOR_ID, new Tizen.NUI.PropertyValue(value)); + SetProperty(View.Property.DOWN_FOCUSABLE_VIEW_ID, new Tizen.NUI.PropertyValue(value)); } } @@ -1355,88 +1522,88 @@ namespace Tizen.NUI.BaseComponents /// /// The left focusable view.
/// This will return NULL if not set.
- /// This will also return NULL if the specified left focusable view is not on stage.
+ /// This will also return NULL if the specified left focusable view is not on Window.
/// public View LeftFocusableView { // As native side will be only storing IDs so need a logic to convert View to ID and vice-versa. get { - if (LeftFocusableActorId >= 0) + if (LeftFocusableViewId >= 0) { - return ConvertIdToView((uint)LeftFocusableActorId); + return ConvertIdToView((uint)LeftFocusableViewId); } return null; } set { - LeftFocusableActorId = (int)value.GetId(); + LeftFocusableViewId = (int)value.GetId(); } } /// /// The right focusable view.
/// This will return NULL if not set.
- /// This will also return NULL if the specified right focusable view is not on stage.
+ /// This will also return NULL if the specified right focusable view is not on Window.
/// public View RightFocusableView { // As native side will be only storing IDs so need a logic to convert View to ID and vice-versa. get { - if (RightFocusableActorId >= 0) + if (RightFocusableViewId >= 0) { - return ConvertIdToView((uint)RightFocusableActorId); + return ConvertIdToView((uint)RightFocusableViewId); } return null; } set { - RightFocusableActorId = (int)value.GetId(); + RightFocusableViewId = (int)value.GetId(); } } /// /// The up focusable view.
/// This will return NULL if not set.
- /// This will also return NULL if the specified up focusable view is not on stage.
+ /// This will also return NULL if the specified up focusable view is not on Window.
/// public View UpFocusableView { // As native side will be only storing IDs so need a logic to convert View to ID and vice-versa. get { - if (UpFocusableActorId >= 0) + if (UpFocusableViewId >= 0) { - return ConvertIdToView((uint)UpFocusableActorId); + return ConvertIdToView((uint)UpFocusableViewId); } return null; } set { - UpFocusableActorId = (int)value.GetId(); + UpFocusableViewId = (int)value.GetId(); } } /// /// The down focusable view.
/// This will return NULL if not set.
- /// This will also return NULL if the specified down focusable view is not on stage.
+ /// This will also return NULL if the specified down focusable view is not on Window.
/// public View DownFocusableView { // As native side will be only storing IDs so need a logic to convert View to ID and vice-versa. get { - if (DownFocusableActorId >= 0) + if (DownFocusableViewId >= 0) { - return ConvertIdToView((uint)DownFocusableActorId); + return ConvertIdToView((uint)DownFocusableViewId); } return null; } set { - DownFocusableActorId = (int)value.GetId(); + DownFocusableViewId = (int)value.GetId(); } } @@ -1473,6 +1640,2151 @@ namespace Tizen.NUI.BaseComponents /// Disabled } + + /// + /// Retrieves the position of the View.
+ /// The coordinates are relative to the View's parent.
+ /// + public Position CurrentPosition + { + get + { + return GetCurrentPosition(); + } + } + + /// + /// Sets the size of an view for width and height.
+ /// Geometry can be scaled to fit within this area.
+ /// This does not interfere with the views scale factor.
+ /// The views default depth is the minimum of width & height.
+ /// + public Size2D Size2D + { + get + { + Size temp = new Size(0.0f, 0.0f, 0.0f); + GetProperty(View.Property.SIZE).Get(temp); + return new Size2D(temp); + } + set + { + SetProperty(View.Property.SIZE, new Tizen.NUI.PropertyValue(new Size(value))); + } + } + + /// + /// Retrieves the size of the View.
+ /// The coordinates are relative to the View's parent.
+ /// + public Size CurrentSize + { + get + { + return GetCurrentSize(); + } + } + + /// + /// Retrieves the view's parent.
+ /// + public View Parent + { + get + { + return GetParent(); + } + } + + public bool Visibility + { + get + { + return IsVisible(); + } + } + + /// + /// Retrieves and sets the view's opacity.
+ /// + public float Opacity + { + get + { + float temp = 0.0f; + GetProperty(View.Property.OPACITY).Get(ref temp); + return temp; + } + set + { + SetProperty(View.Property.OPACITY, new Tizen.NUI.PropertyValue(value)); + } + } + + /// + /// Sets the position of the View for X and Y.
+ /// By default, sets the position vector between the parent origin and anchor point(default).
+ /// If Position inheritance if disabled, sets the world position.
+ /// + public Position2D Position2D + { + get + { + Position temp = new Position(0.0f, 0.0f, 0.0f); + GetProperty(View.Property.POSITION).Get(temp); + return new Position2D(temp); + } + set + { + SetProperty(View.Property.POSITION, new Tizen.NUI.PropertyValue(new Position(value))); + } + } + + /// + /// Retrieves screen postion of view's.
+ /// + public Vector2 ScreenPosition + { + get + { + Vector2 temp = new Vector2(0.0f, 0.0f); + GetProperty(View.Property.SCREEN_POSITION).Get(temp); + return temp; + } + } + + /// + /// Determines whether the anchor point should be used to determine the position of the view. + /// This is true by default. + /// + /// If false, then the top-left of the view is used for the position. + /// Setting this to false will allow scaling or rotation around the anchor-point without affecting the view's position. + /// + public bool PositionUsesAnchorPoint + { + get + { + bool temp = false; + if(this) GetProperty(View.Property.POSITION_USES_ANCHOR_POINT).Get(ref temp); + return temp; + } + set + { + if(this) SetProperty(View.Property.POSITION_USES_ANCHOR_POINT, new Tizen.NUI.PropertyValue(value)); + } + } + + public bool StateFocusEnable + { + get + { + return IsKeyboardFocusable(); + } + set + { + SetKeyboardFocusable(value); + } + } + + /// + /// Queries whether the view is connected to the Stage.
+ /// When an view is connected, it will be directly or indirectly parented to the root View.
+ /// + public bool IsOnWindow + { + get + { + return OnWindow(); + } + } + + /// + /// Gets depth in the hierarchy for the view. + /// + public int HierarchyDepth + { + get + { + return GetHierarchyDepth(); + } + } + + /// + /// Sets the sibling order of the view so depth position can be defined within the same parent. + /// + /// + /// Note The initial value is 0. + /// Raise, Lower, RaiseToTop, LowerToBottom, RaiseAbove and LowerBelow will override the sibling order. + /// The values set by this Property will likely change. + /// + public int SiblingOrder + { + get + { + int temp = 0; + GetProperty(View.Property.SIBLING_ORDER).Get(ref temp); + return temp; + } + set + { + SetProperty(View.Property.SIBLING_ORDER, new Tizen.NUI.PropertyValue(value)); + } + } + + /// + /// Shows the View. + /// + /// + /// This is an asynchronous method. + /// + public void Show() + { + SetVisible(true); + } + + /// + /// Hides the View. + /// + /// + /// This is an asynchronous method. + /// If an view is hidden, then the view and its children will not be rendered. + /// This is regardless of the individual visibility of the children i.e.an view will only be rendered if all of its parents are shown. + /// + public void Hide() + { + SetVisible(false); + } + + /// + /// Raise view above the next highest level of view(s). + /// + /// + /// Sibling order of views within the parent will be updated automatically. + /// Initially views added to a parent will have the same sibling order and shown in relation to insertion order. + /// Raising this view above views with the same sibling order as each other will raise this view above them. + /// Once a raise or lower API is used that view will then have an exclusive sibling order independent of insertion. + /// + public void Raise() + { + NDalicPINVOKE.Raise(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + /// + /// Lower the view to underneath the level below view(s). + /// + /// + /// Sibling order of views within the parent will be updated automatically. + /// Lowering this view below views with the same sibling order as each other will lower this view above them. + /// Once a raise or lower API is used that view will then have an exclusive sibling order independent of insertion. + /// + public void Lower() + { + NDalicPINVOKE.Lower(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + /// + /// Raise view above all other views. + /// + /// + /// Sibling order of views within the parent will be updated automatically. + /// Once a raise or lower API is used that view will then have an exclusive sibling order independent of insertion. + /// + public void RaiseToTop() + { + NDalicPINVOKE.RaiseToTop(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + /// + /// Lower view to the bottom of all views. + /// + /// + /// Sibling order of views within the parent will be updated automatically. + /// Once a raise or lower API is used that view will then have an exclusive sibling order independent of insertion. + /// + public void LowerToBottom() + { + NDalicPINVOKE.LowerToBottom(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + /// + /// Raise the view to above the target view. + /// + /// Sibling order of views within the parent will be updated automatically. + /// Views on the level above the target view will still be shown above this view. + /// Raising this view above views with the same sibling order as each other will raise this view above them. + /// Once a raise or lower API is used that view will then have an exclusive sibling order independent of insertion. + /// + /// Will be raised above this view + internal void RaiseAbove(View target) + { + NDalicPINVOKE.RaiseAbove(swigCPtr, View.getCPtr(target)); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + /// + /// Lower the view to below the target view. + /// + /// Sibling order of views within the parent will be updated automatically. + /// Lowering this view below views with the same sibling order as each other will lower this view above them. + /// Once a raise or lower API is used that view will then have an exclusive sibling order independent of insertion. + /// + /// Will be lowered below this view + internal void LowerBelow(View target) + { + NDalicPINVOKE.RaiseAbove(swigCPtr, View.getCPtr(target)); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + 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(); + } + + internal uint GetId() + { + uint ret = NDalicPINVOKE.Actor_GetId(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal bool IsRoot() + { + bool ret = NDalicPINVOKE.Actor_IsRoot(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal bool OnWindow() + { + bool ret = NDalicPINVOKE.Actor_OnStage(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal bool IsLayer() + { + bool ret = NDalicPINVOKE.Actor_IsLayer(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal Layer GetLayer() + { + Layer ret = new Layer(NDalicPINVOKE.Actor_GetLayer(swigCPtr), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + /// + /// Adds a child view to this View. + /// + /// 
This View(the parent) has been initialized. The child view has been initialized. The child view is not the same as the parent view.
+ /// The child will be referenced by its parent. This means that the child will be kept alive, even if the handle passed into this method is reset or destroyed. + /// If the child already has a parent, it will be removed from old parent and reparented to this view. This may change child's position, color, scale etc as it now inherits them from this view. + /// The child + public void Add(View child) + { + NDalicPINVOKE.Actor_Add(swigCPtr, View.getCPtr(child)); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + /// + /// Removes a child View from this View. If the view was not a child of this view, this is a no-op. + /// + /// 
This View(the parent) has been initialized. The child view is not the same as the parent view.
+ /// The child + public void Remove(View child) + { + NDalicPINVOKE.Actor_Remove(swigCPtr, View.getCPtr(child)); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal void Unparent() + { + NDalicPINVOKE.Actor_Unparent(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + /// + /// Retrieves the number of children held by the view. + /// + /// 
The View has been initialized.
+ /// The number of children + public uint GetChildCount() + { + uint ret = NDalicPINVOKE.Actor_GetChildCount(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + /// + /// Retrieves child view by index. + /// + /// 
The View has been initialized.
+ /// The index of the child to retrieve + /// 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); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + /// + /// Search through this view's hierarchy for an view with the given name. + /// The view itself is also considered in the search. + /// + /// 
The View has been initialized.
+ /// The name of the view to find + /// A handle to the view if found, or an empty handle if not + public View FindChildByName(string viewName) + { + View ret = new View(NDalicPINVOKE.Actor_FindChildByName(swigCPtr, viewName), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal View FindChildById(uint id) + { + View ret = new View(NDalicPINVOKE.Actor_FindChildById(swigCPtr, id), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal View GetParent() + { + View ret = new View(NDalicPINVOKE.Actor_GetParent(swigCPtr), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal void SetParentOrigin(Vector3 origin) + { + NDalicPINVOKE.Actor_SetParentOrigin(swigCPtr, Vector3.getCPtr(origin)); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal Vector3 GetCurrentParentOrigin() + { + Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetCurrentParentOrigin(swigCPtr), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal void SetAnchorPoint(Vector3 anchorPoint) + { + NDalicPINVOKE.Actor_SetAnchorPoint(swigCPtr, Vector3.getCPtr(anchorPoint)); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal Vector3 GetCurrentAnchorPoint() + { + Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetCurrentAnchorPoint(swigCPtr), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal void SetSize(float width, float height) + { + NDalicPINVOKE.Actor_SetSize__SWIG_0(swigCPtr, width, height); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal void SetSize(float width, float height, float depth) + { + NDalicPINVOKE.Actor_SetSize__SWIG_1(swigCPtr, width, height, depth); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal void SetSize(Vector2 size) + { + NDalicPINVOKE.Actor_SetSize__SWIG_2(swigCPtr, Vector2.getCPtr(size)); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal void SetSize(Vector3 size) + { + NDalicPINVOKE.Actor_SetSize__SWIG_3(swigCPtr, Vector3.getCPtr(size)); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal Vector3 GetTargetSize() + { + Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetTargetSize(swigCPtr), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal Size GetCurrentSize() + { + Size ret = new Size(NDalicPINVOKE.Actor_GetCurrentSize(swigCPtr), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + /// + /// Returns the natural size of the view.
+ /// Deriving classes stipulate the natural size and by default an view has a ZERO natural size.
+ /// + /// The view's natural size + public Vector3 GetNaturalSize() + { + Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetNaturalSize(swigCPtr), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal void SetPosition(float x, float y) + { + NDalicPINVOKE.Actor_SetPosition__SWIG_0(swigCPtr, x, y); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal void SetPosition(float x, float y, float z) + { + NDalicPINVOKE.Actor_SetPosition__SWIG_1(swigCPtr, x, y, z); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal void SetPosition(Vector3 position) + { + NDalicPINVOKE.Actor_SetPosition__SWIG_2(swigCPtr, Vector3.getCPtr(position)); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal void SetX(float x) + { + NDalicPINVOKE.Actor_SetX(swigCPtr, x); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal void SetY(float y) + { + NDalicPINVOKE.Actor_SetY(swigCPtr, y); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal void SetZ(float z) + { + NDalicPINVOKE.Actor_SetZ(swigCPtr, z); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal void TranslateBy(Vector3 distance) + { + NDalicPINVOKE.Actor_TranslateBy(swigCPtr, Vector3.getCPtr(distance)); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal Position GetCurrentPosition() + { + Position ret = new Position(NDalicPINVOKE.Actor_GetCurrentPosition(swigCPtr), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal Vector3 GetCurrentWorldPosition() + { + Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetCurrentWorldPosition(swigCPtr), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal void SetInheritPosition(bool inherit) + { + NDalicPINVOKE.Actor_SetInheritPosition(swigCPtr, inherit); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal PositionInheritanceMode GetPositionInheritanceMode() + { + PositionInheritanceMode ret = (PositionInheritanceMode)NDalicPINVOKE.Actor_GetPositionInheritanceMode(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal bool IsPositionInherited() + { + bool ret = NDalicPINVOKE.Actor_IsPositionInherited(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal void SetOrientation(Degree angle, Vector3 axis) + { + NDalicPINVOKE.Actor_SetOrientation__SWIG_0(swigCPtr, Degree.getCPtr(angle), Vector3.getCPtr(axis)); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal void SetOrientation(Radian angle, Vector3 axis) + { + NDalicPINVOKE.Actor_SetOrientation__SWIG_1(swigCPtr, Radian.getCPtr(angle), Vector3.getCPtr(axis)); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal void SetOrientation(Rotation orientation) + { + NDalicPINVOKE.Actor_SetOrientation__SWIG_2(swigCPtr, Rotation.getCPtr(orientation)); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal void RotateBy(Degree angle, Vector3 axis) + { + NDalicPINVOKE.Actor_RotateBy__SWIG_0(swigCPtr, Degree.getCPtr(angle), Vector3.getCPtr(axis)); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal void RotateBy(Radian angle, Vector3 axis) + { + NDalicPINVOKE.Actor_RotateBy__SWIG_1(swigCPtr, Radian.getCPtr(angle), Vector3.getCPtr(axis)); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal void RotateBy(Rotation relativeRotation) + { + NDalicPINVOKE.Actor_RotateBy__SWIG_2(swigCPtr, Rotation.getCPtr(relativeRotation)); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal Rotation GetCurrentOrientation() + { + Rotation ret = new Rotation(NDalicPINVOKE.Actor_GetCurrentOrientation(swigCPtr), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal void SetInheritOrientation(bool inherit) + { + NDalicPINVOKE.Actor_SetInheritOrientation(swigCPtr, inherit); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal bool IsOrientationInherited() + { + bool ret = NDalicPINVOKE.Actor_IsOrientationInherited(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal Rotation GetCurrentWorldOrientation() + { + Rotation ret = new Rotation(NDalicPINVOKE.Actor_GetCurrentWorldOrientation(swigCPtr), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal void SetScale(float scale) + { + NDalicPINVOKE.Actor_SetScale__SWIG_0(swigCPtr, scale); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal void SetScale(float scaleX, float scaleY, float scaleZ) + { + NDalicPINVOKE.Actor_SetScale__SWIG_1(swigCPtr, scaleX, scaleY, scaleZ); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal void SetScale(Vector3 scale) + { + NDalicPINVOKE.Actor_SetScale__SWIG_2(swigCPtr, Vector3.getCPtr(scale)); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal void ScaleBy(Vector3 relativeScale) + { + NDalicPINVOKE.Actor_ScaleBy(swigCPtr, Vector3.getCPtr(relativeScale)); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal Vector3 GetCurrentScale() + { + Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetCurrentScale(swigCPtr), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal Vector3 GetCurrentWorldScale() + { + Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetCurrentWorldScale(swigCPtr), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal void SetInheritScale(bool inherit) + { + NDalicPINVOKE.Actor_SetInheritScale(swigCPtr, inherit); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal bool IsScaleInherited() + { + bool ret = NDalicPINVOKE.Actor_IsScaleInherited(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal Matrix GetCurrentWorldMatrix() + { + Matrix ret = new Matrix(NDalicPINVOKE.Actor_GetCurrentWorldMatrix(swigCPtr), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal void SetVisible(bool visible) + { + NDalicPINVOKE.Actor_SetVisible(swigCPtr, visible); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal bool IsVisible() + { + bool ret = NDalicPINVOKE.Actor_IsVisible(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal void SetOpacity(float opacity) + { + NDalicPINVOKE.Actor_SetOpacity(swigCPtr, opacity); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal float GetCurrentOpacity() + { + float ret = NDalicPINVOKE.Actor_GetCurrentOpacity(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal void SetColor(Vector4 color) + { + NDalicPINVOKE.Actor_SetColor(swigCPtr, Vector4.getCPtr(color)); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal Vector4 GetCurrentColor() + { + Vector4 ret = new Vector4(NDalicPINVOKE.Actor_GetCurrentColor(swigCPtr), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal void SetColorMode(ColorMode colorMode) + { + NDalicPINVOKE.Actor_SetColorMode(swigCPtr, (int)colorMode); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal ColorMode GetColorMode() + { + ColorMode ret = (ColorMode)NDalicPINVOKE.Actor_GetColorMode(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal Vector4 GetCurrentWorldColor() + { + Vector4 ret = new Vector4(NDalicPINVOKE.Actor_GetCurrentWorldColor(swigCPtr), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal void SetDrawMode(DrawModeType drawMode) + { + NDalicPINVOKE.Actor_SetDrawMode(swigCPtr, (int)drawMode); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal DrawModeType GetDrawMode() + { + DrawModeType ret = (DrawModeType)NDalicPINVOKE.Actor_GetDrawMode(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal void SetSensitive(bool sensitive) + { + NDalicPINVOKE.Actor_SetSensitive(swigCPtr, sensitive); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal bool IsSensitive() + { + bool ret = NDalicPINVOKE.Actor_IsSensitive(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + /// + /// Converts screen coordinates into the view's coordinate system using the default camera. + /// + /// 
The View has been initialized.
+ /// The view coordinates are relative to the top-left(0.0, 0.0, 0.5) + /// On return, the X-coordinate relative to the view + /// On return, the Y-coordinate relative to the view + /// The screen X-coordinate + /// The screen Y-coordinate + /// True if the conversion succeeded + public bool ScreenToLocal(out float localX, out float localY, float screenX, float screenY) + { + bool ret = NDalicPINVOKE.Actor_ScreenToLocal(swigCPtr, out localX, out localY, screenX, screenY); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal void SetLeaveRequired(bool required) + { + NDalicPINVOKE.Actor_SetLeaveRequired(swigCPtr, required); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal bool GetLeaveRequired() + { + bool ret = NDalicPINVOKE.Actor_GetLeaveRequired(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal void SetKeyboardFocusable(bool focusable) + { + NDalicPINVOKE.Actor_SetKeyboardFocusable(swigCPtr, focusable); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal bool IsKeyboardFocusable() + { + bool ret = NDalicPINVOKE.Actor_IsKeyboardFocusable(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal void SetResizePolicy(ResizePolicyType policy, DimensionType dimension) + { + NDalicPINVOKE.Actor_SetResizePolicy(swigCPtr, (int)policy, (int)dimension); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal ResizePolicyType GetResizePolicy(DimensionType dimension) + { + ResizePolicyType ret = (ResizePolicyType)NDalicPINVOKE.Actor_GetResizePolicy(swigCPtr, (int)dimension); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal void SetSizeScalePolicy(SizeScalePolicyType policy) + { + NDalicPINVOKE.Actor_SetSizeScalePolicy(swigCPtr, (int)policy); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal SizeScalePolicyType GetSizeScalePolicy() + { + SizeScalePolicyType ret = (SizeScalePolicyType)NDalicPINVOKE.Actor_GetSizeScalePolicy(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + /// + /// Sets the relative to parent size factor of the view.
+ /// This factor is only used when ResizePolicy is set to either: + /// ResizePolicy::SIZE_RELATIVE_TO_PARENT or ResizePolicy::SIZE_FIXED_OFFSET_FROM_PARENT.
+ /// This view's size is set to the view's size multiplied by or added to this factor, depending on ResizePolicy.
+ /// + /// 
The View has been initialized.
+ /// A Vector3 representing the relative factor to be applied to each axis + public void SetSizeModeFactor(Vector3 factor) + { + NDalicPINVOKE.Actor_SetSizeModeFactor(swigCPtr, Vector3.getCPtr(factor)); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal Vector3 GetSizeModeFactor() + { + Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetSizeModeFactor(swigCPtr), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + /// + /// Calculates the height of the view given a width.
+ /// The natural size is used for default calculation.
+ /// size 0 is treated as aspect ratio 1:1.
+ /// + /// Width to use + /// The height based on the width + public float GetHeightForWidth(float width) + { + float ret = NDalicPINVOKE.Actor_GetHeightForWidth(swigCPtr, width); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + /// + /// Calculates the width of the view given a height.
+ /// The natural size is used for default calculation.
+ /// size 0 is treated as aspect ratio 1:1.
+ /// + /// Height to use + /// The width based on the height + public float GetWidthForHeight(float height) + { + float ret = NDalicPINVOKE.Actor_GetWidthForHeight(swigCPtr, height); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public float GetRelayoutSize(DimensionType dimension) + { + float ret = NDalicPINVOKE.Actor_GetRelayoutSize(swigCPtr, (int)dimension); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public void SetPadding(PaddingType padding) + { + NDalicPINVOKE.Actor_SetPadding(swigCPtr, PaddingType.getCPtr(padding)); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public void GetPadding(PaddingType paddingOut) + { + NDalicPINVOKE.Actor_GetPadding(swigCPtr, PaddingType.getCPtr(paddingOut)); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal void SetMinimumSize(Vector2 size) + { + NDalicPINVOKE.Actor_SetMinimumSize(swigCPtr, Vector2.getCPtr(size)); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal Vector2 GetMinimumSize() + { + Vector2 ret = new Vector2(NDalicPINVOKE.Actor_GetMinimumSize(swigCPtr), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal void SetMaximumSize(Vector2 size) + { + NDalicPINVOKE.Actor_SetMaximumSize(swigCPtr, Vector2.getCPtr(size)); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal Vector2 GetMaximumSize() + { + Vector2 ret = new Vector2(NDalicPINVOKE.Actor_GetMaximumSize(swigCPtr), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal int GetHierarchyDepth() + { + int ret = NDalicPINVOKE.Actor_GetHierarchyDepth(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal uint AddRenderer(Renderer renderer) + { + uint ret = NDalicPINVOKE.Actor_AddRenderer(swigCPtr, Renderer.getCPtr(renderer)); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal uint GetRendererCount() + { + uint ret = NDalicPINVOKE.Actor_GetRendererCount(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal Renderer GetRendererAt(uint index) + { + Renderer ret = new Renderer(NDalicPINVOKE.Actor_GetRendererAt(swigCPtr, index), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal void RemoveRenderer(Renderer renderer) + { + NDalicPINVOKE.Actor_RemoveRenderer__SWIG_0(swigCPtr, Renderer.getCPtr(renderer)); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal void RemoveRenderer(uint index) + { + NDalicPINVOKE.Actor_RemoveRenderer__SWIG_1(swigCPtr, index); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal TouchDataSignal TouchSignal() + { + TouchDataSignal ret = new TouchDataSignal(NDalicPINVOKE.Actor_TouchSignal(swigCPtr), false); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal HoverSignal HoveredSignal() + { + HoverSignal ret = new HoverSignal(NDalicPINVOKE.Actor_HoveredSignal(swigCPtr), false); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal WheelSignal WheelEventSignal() + { + WheelSignal ret = new WheelSignal(NDalicPINVOKE.Actor_WheelEventSignal(swigCPtr), false); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal ViewSignal OnWindowSignal() + { + ViewSignal ret = new ViewSignal(NDalicPINVOKE.Actor_OnStageSignal(swigCPtr), false); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal ViewSignal OffWindowSignal() + { + ViewSignal ret = new ViewSignal(NDalicPINVOKE.Actor_OffStageSignal(swigCPtr), false); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal ViewSignal OnRelayoutSignal() + { + ViewSignal ret = new ViewSignal(NDalicPINVOKE.Actor_OnRelayoutSignal(swigCPtr), false); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal ViewVisibilityChangedSignal VisibilityChangedSignal(View view) { + ViewVisibilityChangedSignal ret = new ViewVisibilityChangedSignal(NDalicPINVOKE.VisibilityChangedSignal(View.getCPtr(view)), false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + /// + /// Gets/Sets the origin of an view, within its parent's area.
+ /// This is expressed in unit coordinates, such that (0.0, 0.0, 0.5) is the top-left corner of the parent, and(1.0, 1.0, 0.5) is the bottom-right corner.
+ /// The default parent-origin is ParentOrigin.TopLeft (0.0, 0.0, 0.5).
+ /// An view's position is the distance between this origin, and the view's anchor-point.
+ /// + /// 
The View has been initialized.
+ public Position ParentOrigin + { + get + { + Position temp = new Position(0.0f, 0.0f, 0.0f); + GetProperty(View.Property.PARENT_ORIGIN).Get(temp); + return temp; + } + set + { + SetProperty(View.Property.PARENT_ORIGIN, new Tizen.NUI.PropertyValue(value)); + } + } + + internal float ParentOriginX + { + get + { + float temp = 0.0f; + GetProperty(View.Property.PARENT_ORIGIN_X).Get(ref temp); + return temp; + } + set + { + SetProperty(View.Property.PARENT_ORIGIN_X, new Tizen.NUI.PropertyValue(value)); + } + } + + internal float ParentOriginY + { + get + { + float temp = 0.0f; + GetProperty(View.Property.PARENT_ORIGIN_Y).Get(ref temp); + return temp; + } + set + { + SetProperty(View.Property.PARENT_ORIGIN_Y, new Tizen.NUI.PropertyValue(value)); + } + } + + internal float ParentOriginZ + { + get + { + float temp = 0.0f; + GetProperty(View.Property.PARENT_ORIGIN_Z).Get(ref temp); + return temp; + } + set + { + SetProperty(View.Property.PARENT_ORIGIN_Z, new Tizen.NUI.PropertyValue(value)); + } + } + + /// + /// Gets/Sets the anchor-point of an view.
+ /// This is expressed in unit coordinates, such that (0.0, 0.0, 0.5) is the top-left corner of the view, and (1.0, 1.0, 0.5) is the bottom-right corner.
+ /// The default anchor point is AnchorPoint.Center (0.5, 0.5, 0.5).
+ /// An view position is the distance between its parent-origin and this anchor-point.
+ /// An view's orientation is the rotation from its default orientation, the rotation is centered around its anchor-point.
+ /// 
The View has been initialized.
+ /// + public Position AnchorPoint + { + get + { + Position temp = new Position(0.0f, 0.0f, 0.0f); + GetProperty(View.Property.ANCHOR_POINT).Get(temp); + return temp; + } + set + { + SetProperty(View.Property.ANCHOR_POINT, new Tizen.NUI.PropertyValue(value)); + } + } + + internal float AnchorPointX + { + get + { + float temp = 0.0f; + GetProperty(View.Property.ANCHOR_POINT_X).Get(ref temp); + return temp; + } + set + { + SetProperty(View.Property.ANCHOR_POINT_X, new Tizen.NUI.PropertyValue(value)); + } + } + + internal float AnchorPointY + { + get + { + float temp = 0.0f; + GetProperty(View.Property.ANCHOR_POINT_Y).Get(ref temp); + return temp; + } + set + { + SetProperty(View.Property.ANCHOR_POINT_Y, new Tizen.NUI.PropertyValue(value)); + } + } + + internal float AnchorPointZ + { + get + { + float temp = 0.0f; + GetProperty(View.Property.ANCHOR_POINT_Z).Get(ref temp); + return temp; + } + set + { + SetProperty(View.Property.ANCHOR_POINT_Z, new Tizen.NUI.PropertyValue(value)); + } + } + + /// + /// Gets/Sets the size of an view.
+ /// Geometry can be scaled to fit within this area.
+ /// This does not interfere with the views scale factor.
+ /// + public Size Size + { + get + { + Size temp = new Size(0.0f, 0.0f, 0.0f); + GetProperty(View.Property.SIZE).Get(temp); + return temp; + } + set + { + SetProperty(View.Property.SIZE, new Tizen.NUI.PropertyValue(value)); + } + } + + /// + /// Gets/Sets the size width of an view. + /// + public float SizeWidth + { + get + { + float temp = 0.0f; + GetProperty(View.Property.SIZE_WIDTH).Get(ref temp); + return temp; + } + set + { + SetProperty(View.Property.SIZE_WIDTH, new Tizen.NUI.PropertyValue(value)); + } + } + + /// + /// Gets/Sets the size height of an view. + /// + public float SizeHeight + { + get + { + float temp = 0.0f; + GetProperty(View.Property.SIZE_HEIGHT).Get(ref temp); + return temp; + } + set + { + SetProperty(View.Property.SIZE_HEIGHT, new Tizen.NUI.PropertyValue(value)); + } + } + + /// + /// Gets/Sets the size depth of an view. + /// + public float SizeDepth + { + get + { + float temp = 0.0f; + GetProperty(View.Property.SIZE_DEPTH).Get(ref temp); + return temp; + } + set + { + SetProperty(View.Property.SIZE_DEPTH, new Tizen.NUI.PropertyValue(value)); + } + } + + /// + /// Gets/Sets the position of the View.
+ /// By default, sets the position vector between the parent origin and anchor point(default).
+ /// If Position inheritance if disabled, sets the world position.
+ /// + public Position Position + { + get + { + Vector3 temp = new Vector3(0.0f, 0.0f, 0.0f); + GetProperty(View.Property.POSITION).Get(temp); + return temp; + } + set + { + SetProperty(View.Property.POSITION, new Tizen.NUI.PropertyValue(value)); + } + } + + /// + /// Gets/Sets the position x of the View. + /// + public float PositionX + { + get + { + float temp = 0.0f; + GetProperty(View.Property.POSITION_X).Get(ref temp); + return temp; + } + set + { + SetProperty(View.Property.POSITION_X, new Tizen.NUI.PropertyValue(value)); + } + } + + /// + /// Gets/Sets the position y of the View. + /// + public float PositionY + { + get + { + float temp = 0.0f; + GetProperty(View.Property.POSITION_Y).Get(ref temp); + return temp; + } + set + { + SetProperty(View.Property.POSITION_Y, new Tizen.NUI.PropertyValue(value)); + } + } + + /// + /// Gets/Sets the position z of the View. + /// + public float PositionZ + { + get + { + float temp = 0.0f; + GetProperty(View.Property.POSITION_Z).Get(ref temp); + return temp; + } + set + { + SetProperty(View.Property.POSITION_Z, new Tizen.NUI.PropertyValue(value)); + } + } + + /// + /// Gets/Sets the world position of the View. + /// + public Vector3 WorldPosition + { + get + { + Vector3 temp = new Vector3(0.0f, 0.0f, 0.0f); + GetProperty(View.Property.WORLD_POSITION).Get(temp); + return temp; + } + } + + internal float WorldPositionX + { + get + { + float temp = 0.0f; + GetProperty(View.Property.WORLD_POSITION_X).Get(ref temp); + return temp; + } + } + + internal float WorldPositionY + { + get + { + float temp = 0.0f; + GetProperty(View.Property.WORLD_POSITION_Y).Get(ref temp); + return temp; + } + } + + internal float WorldPositionZ + { + get + { + float temp = 0.0f; + GetProperty(View.Property.WORLD_POSITION_Z).Get(ref temp); + return temp; + } + } + + /// + /// Gets/Sets the orientation of the View.
+ /// An view's orientation is the rotation from its default orientation, and the rotation is centered around its anchor-point.
+ /// + /// This is an asynchronous method. + public Rotation Orientation + { + get + { + Rotation temp = new Rotation(); + GetProperty(View.Property.ORIENTATION).Get(temp); + return temp; + } + set + { + SetProperty(View.Property.ORIENTATION, new Tizen.NUI.PropertyValue(value)); + } + } + + /// + /// Gets/Sets the world orientation of the View.
+ /// + public Rotation WorldOrientation + { + get + { + Rotation temp = new Rotation(); + GetProperty(View.Property.WORLD_ORIENTATION).Get(temp); + return temp; + } + } + + /// + /// Gets/Sets the scale factor applied to an view.
+ /// + public Vector3 Scale + { + get + { + Vector3 temp = new Vector3(0.0f, 0.0f, 0.0f); + GetProperty(View.Property.SCALE).Get(temp); + return temp; + } + set + { + SetProperty(View.Property.SCALE, new Tizen.NUI.PropertyValue(value)); + } + } + + /// + /// Gets/Sets the scale x factor applied to an view. + /// + public float ScaleX + { + get + { + float temp = 0.0f; + GetProperty(View.Property.SCALE_X).Get(ref temp); + return temp; + } + set + { + SetProperty(View.Property.SCALE_X, new Tizen.NUI.PropertyValue(value)); + } + } + + /// + /// Gets/Sets the scale y factor applied to an view. + /// + public float ScaleY + { + get + { + float temp = 0.0f; + GetProperty(View.Property.SCALE_Y).Get(ref temp); + return temp; + } + set + { + SetProperty(View.Property.SCALE_Y, new Tizen.NUI.PropertyValue(value)); + } + } + + /// + /// Gets/Sets the scale z factor applied to an view. + /// + public float ScaleZ + { + get + { + float temp = 0.0f; + GetProperty(View.Property.SCALE_Z).Get(ref temp); + return temp; + } + set + { + SetProperty(View.Property.SCALE_Z, new Tizen.NUI.PropertyValue(value)); + } + } + + /// + /// Gets the world scale of View. + /// + public Vector3 WorldScale + { + get + { + Vector3 temp = new Vector3(0.0f, 0.0f, 0.0f); + GetProperty(View.Property.WORLD_SCALE).Get(temp); + return temp; + } + } + + /// + /// Retrieves the visibility flag of an view. + /// + /// + /// If an view is not visible, then the view and its children will not be rendered. + /// This is regardless of the individual visibility values of the children i.e.an view will only be rendered if all of its parents have visibility set to true. + /// + public bool Visible + { + get + { + bool temp = false; + GetProperty(View.Property.VISIBLE).Get(ref temp); + return temp; + }/* only get is required : removed + set + { + SetProperty(View.Property.VISIBLE, new Tizen.NUI.PropertyValue(value)); + }*/ + } + + /// + /// Gets/Sets the view's mix color red. + /// + public float ColorRed + { + get + { + float temp = 0.0f; + GetProperty(View.Property.COLOR_RED).Get(ref temp); + return temp; + } + set + { + SetProperty(View.Property.COLOR_RED, new Tizen.NUI.PropertyValue(value)); + } + } + + /// + /// Gets/Sets the view's mix color green. + /// + public float ColorGreen + { + get + { + float temp = 0.0f; + GetProperty(View.Property.COLOR_GREEN).Get(ref temp); + return temp; + } + set + { + SetProperty(View.Property.COLOR_GREEN, new Tizen.NUI.PropertyValue(value)); + } + } + + /// + /// Gets/Sets the view's mix color blue + /// + public float ColorBlue + { + get + { + float temp = 0.0f; + GetProperty(View.Property.COLOR_BLUE).Get(ref temp); + return temp; + } + set + { + SetProperty(View.Property.COLOR_BLUE, new Tizen.NUI.PropertyValue(value)); + } + } + + /// + /// Gets/Sets the view's mix color alpha. + /// + public float ColorAlpha + { + get + { + float temp = 0.0f; + GetProperty(View.Property.COLOR_ALPHA).Get(ref temp); + return temp; + } + set + { + SetProperty(View.Property.COLOR_ALPHA, new Tizen.NUI.PropertyValue(value)); + } + } + + /// + /// Gets the view's world color. + /// + public Vector4 WorldColor + { + get + { + Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f); + GetProperty(View.Property.WORLD_COLOR).Get(temp); + return temp; + } + } + + internal Matrix WorldMatrix + { + get + { + Matrix temp = new Matrix(); + GetProperty(View.Property.WORLD_MATRIX).Get(temp); + return temp; + } + } + + /// + /// Gets/Sets the View's name. + /// + public string Name + { + get + { + string temp; + GetProperty(View.Property.NAME).Get(out temp); + return temp; + } + set + { + SetProperty(View.Property.NAME, new Tizen.NUI.PropertyValue(value)); + } + } + + /// + /// Gets/Sets the status of whether an view should emit touch or hover signals. + /// + public bool Sensitive + { + get + { + bool temp = false; + GetProperty(View.Property.SENSITIVE).Get(ref temp); + return temp; + } + set + { + SetProperty(View.Property.SENSITIVE, new Tizen.NUI.PropertyValue(value)); + } + } + + /// + /// Gets/Sets the status of whether the view should receive a notification when touch or hover motion events leave the boundary of the view. + /// + public bool LeaveRequired + { + get + { + bool temp = false; + GetProperty(View.Property.LEAVE_REQUIRED).Get(ref temp); + return temp; + } + set + { + SetProperty(View.Property.LEAVE_REQUIRED, new Tizen.NUI.PropertyValue(value)); + } + } + + /// + /// Gets/Sets the status of whether a child view inherits it's parent's orientation. + /// + public bool InheritOrientation + { + get + { + bool temp = false; + GetProperty(View.Property.INHERIT_ORIENTATION).Get(ref temp); + return temp; + } + set + { + SetProperty(View.Property.INHERIT_ORIENTATION, new Tizen.NUI.PropertyValue(value)); + } + } + + /// + /// Gets/Sets the status of whether a child view inherits it's parent's scale. + /// + public bool InheritScale + { + get + { + bool temp = false; + GetProperty(View.Property.INHERIT_SCALE).Get(ref temp); + return temp; + } + set + { + SetProperty(View.Property.INHERIT_SCALE, new Tizen.NUI.PropertyValue(value)); + } + } + + /// + /// Gets/Sets the view's color mode.
+ /// This specifies whether the View uses its own color, or inherits its parent color.
+ /// The default is UseOwnMultiplyParentAlpha.
+ /// + public ColorMode ColorMode + { + get + { + string temp; + if (GetProperty(View.Property.COLOR_MODE).Get(out temp) == false) + { +#if DEBUG_ON + Tizen.Log.Error("NUI", "ColorMode get error!"); +#endif + } + switch (temp) + { + case "USE_OWN_COLOR": + return ColorMode.UseOwnColor; + case "USE_PARENT_COLOR": + return ColorMode.UseParentColor; + case "USE_OWN_MULTIPLY_PARENT_COLOR": + return ColorMode.UseOwnMultiplyParentColor; + case "USE_OWN_MULTIPLY_PARENT_ALPHA": + return ColorMode.UseOwnMultiplyParentAlpha; + default: + return ColorMode.UseOwnMultiplyParentAlpha; + } + } + set + { + SetProperty(View.Property.COLOR_MODE, new Tizen.NUI.PropertyValue((int)value)); + } + } + + public string PositionInheritance + { + get + { + string temp; + GetProperty(View.Property.POSITION_INHERITANCE).Get(out temp); + return temp; + } + set + { + SetProperty(View.Property.POSITION_INHERITANCE, new Tizen.NUI.PropertyValue(value)); + } + } + + /// + /// Gets/Sets the status of how the view and its children should be drawn.
+ /// Not all views are renderable, but DrawMode can be inherited from any view.
+ /// If an object is in a 3D layer, it will be depth-tested against other objects in the world i.e. it may be obscured if other objects are in front.
+ /// If DrawMode.Overlay2D is used, the view and its children will be drawn as a 2D overlay.
+ /// Overlay views are drawn in a separate pass, after all non-overlay views within the Layer.
+ /// For overlay views, the drawing order is with respect to tree levels of Views, and depth-testing will not be used.
+ /// + public DrawModeType DrawMode + { + get + { + string temp; + if (GetProperty(View.Property.DRAW_MODE).Get(out temp) == false) + { +#if DEBUG_ON + Tizen.Log.Error("NUI", "DrawMode get error!"); +#endif + } + switch (temp) + { + case "NORMAL": + return DrawModeType.Normal; + case "OVERLAY_2D": + return DrawModeType.Overlay2D; + case "STENCIL": + return DrawModeType.Stencil; + default: + return DrawModeType.Normal; + } + } + set + { + SetProperty(View.Property.DRAW_MODE, new Tizen.NUI.PropertyValue((int)value)); + } + } + + /// + /// Gets/Sets the relative to parent size factor of the view.
+ /// This factor is only used when ResizePolicyType is set to either: ResizePolicyType.SizeRelativeToParent or ResizePolicyType.SizeFixedOffsetFromParent.
+ /// This view's size is set to the view's size multiplied by or added to this factor, depending on ResizePolicyType.
+ /// + public Vector3 SizeModeFactor + { + get + { + Vector3 temp = new Vector3(0.0f, 0.0f, 0.0f); + GetProperty(View.Property.SIZE_MODE_FACTOR).Get(temp); + return temp; + } + set + { + SetProperty(View.Property.SIZE_MODE_FACTOR, new Tizen.NUI.PropertyValue(value)); + } + } + + /// + /// Gets/Sets the width resize policy to be used. + /// + public ResizePolicyType WidthResizePolicy + { + get + { + string temp; + if (GetProperty(View.Property.WIDTH_RESIZE_POLICY).Get(out temp) == false) + { +#if DEBUG_ON + Tizen.Log.Error("NUI", "WidthResizePolicy get error!"); +#endif + } + switch (temp) + { + case "FIXED": + return ResizePolicyType.Fixed; + case "USE_NATURAL_SIZE": + return ResizePolicyType.UseNaturalSize; + case "FILL_TO_PARENT": + return ResizePolicyType.FillToParent; + case "SIZE_RELATIVE_TO_PARENT": + return ResizePolicyType.SizeRelativeToParent; + case "SIZE_FIXED_OFFSET_FROM_PARENT": + return ResizePolicyType.SizeFixedOffsetFromParent; + case "FIT_TO_CHILDREN": + return ResizePolicyType.FitToChildren; + case "DIMENSION_DEPENDENCY": + return ResizePolicyType.DimensionDependency; + case "USE_ASSIGNED_SIZE": + return ResizePolicyType.UseAssignedSize; + default: + return ResizePolicyType.Fixed; + } + } + set + { + SetProperty(View.Property.WIDTH_RESIZE_POLICY, new Tizen.NUI.PropertyValue((int)value)); + } + } + + /// + /// Gets/Sets the height resize policy to be used. + /// + public ResizePolicyType HeightResizePolicy + { + get + { + string temp; + if (GetProperty(View.Property.HEIGHT_RESIZE_POLICY).Get(out temp) == false) + { +#if DEBUG_ON + Tizen.Log.Error("NUI", "HeightResizePolicy get error!"); +#endif + } + switch (temp) + { + case "FIXED": + return ResizePolicyType.Fixed; + case "USE_NATURAL_SIZE": + return ResizePolicyType.UseNaturalSize; + case "FILL_TO_PARENT": + return ResizePolicyType.FillToParent; + case "SIZE_RELATIVE_TO_PARENT": + return ResizePolicyType.SizeRelativeToParent; + case "SIZE_FIXED_OFFSET_FROM_PARENT": + return ResizePolicyType.SizeFixedOffsetFromParent; + case "FIT_TO_CHILDREN": + return ResizePolicyType.FitToChildren; + case "DIMENSION_DEPENDENCY": + return ResizePolicyType.DimensionDependency; + case "USE_ASSIGNED_SIZE": + return ResizePolicyType.UseAssignedSize; + default: + return ResizePolicyType.Fixed; + } + } + set + { + SetProperty(View.Property.HEIGHT_RESIZE_POLICY, new Tizen.NUI.PropertyValue((int)value)); + } + } + + /// + /// Gets/Sets the policy to use when setting size with size negotiation.
+ /// Defaults to SizeScalePolicyType.UseSizeSet.
+ /// + public SizeScalePolicyType SizeScalePolicy + { + get + { + string temp; + if (GetProperty(View.Property.SIZE_SCALE_POLICY).Get(out temp) == false) + { +#if DEBUG_ON + Tizen.Log.Error("NUI", "SizeScalePolicy get error!"); +#endif + } + switch (temp) + { + case "USE_SIZE_SET": + return SizeScalePolicyType.UseSizeSet; + case "FIT_WITH_ASPECT_RATIO": + return SizeScalePolicyType.FitWithAspectRatio; + case "FILL_WITH_ASPECT_RATIO": + return SizeScalePolicyType.FillWithAspectRatio; + default: + return SizeScalePolicyType.UseSizeSet; + } + } + set + { + string valueToString = ""; + switch (value) + { + case SizeScalePolicyType.UseSizeSet: + { + valueToString = "USE_SIZE_SET"; + break; + } + case SizeScalePolicyType.FitWithAspectRatio: + { + valueToString = "FIT_WITH_ASPECT_RATIO"; + break; + } + case SizeScalePolicyType.FillWithAspectRatio: + { + valueToString = "FILL_WITH_ASPECT_RATIO"; + break; + } + default: + { + valueToString = "USE_SIZE_SET"; + break; + } + } + SetProperty(View.Property.SIZE_SCALE_POLICY, new Tizen.NUI.PropertyValue(valueToString)); + } + } + + /// + /// Gets/Sets the status of whether the width size is dependent on height size. + /// + public bool WidthForHeight + { + get + { + bool temp = false; + GetProperty(View.Property.WIDTH_FOR_HEIGHT).Get(ref temp); + return temp; + } + set + { + SetProperty(View.Property.WIDTH_FOR_HEIGHT, new Tizen.NUI.PropertyValue(value)); + } + } + + /// + /// Gets/Sets the status of whether the height size is dependent on width size. + /// + public bool HeightForWidth + { + get + { + bool temp = false; + GetProperty(View.Property.HEIGHT_FOR_WIDTH).Get(ref temp); + return temp; + } + set + { + SetProperty(View.Property.HEIGHT_FOR_WIDTH, new Tizen.NUI.PropertyValue(value)); + } + } + + /// + /// Gets/Sets the padding for use in layout. + /// + public Vector4 Padding + { + get + { + Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f); + GetProperty(View.Property.PADDING).Get(temp); + return temp; + } + set + { + SetProperty(View.Property.PADDING, new Tizen.NUI.PropertyValue(value)); + } + } + + /// + /// Gets/Sets the minimum size an view can be assigned in size negotiation. + /// + public Size2D MinimumSize + { + get + { + Size2D temp = new Size2D(0, 0); + GetProperty(View.Property.MINIMUM_SIZE).Get(temp); + return temp; + } + set + { + SetProperty(View.Property.MINIMUM_SIZE, new Tizen.NUI.PropertyValue(value)); + } + } + + /// + /// Gets/Sets the maximum size an view can be assigned in size negotiation. + /// + public Size2D MaximumSize + { + get + { + Size2D temp = new Size2D(0, 0); + GetProperty(View.Property.MAXIMUM_SIZE).Get(temp); + return temp; + } + set + { + SetProperty(View.Property.MAXIMUM_SIZE, new Tizen.NUI.PropertyValue(value)); + } + } + + /// + /// Gets/Sets whether a child view inherits it's parent's position.
+ /// Default is to inherit.
+ /// Switching this off means that using Position sets the view's world position, i.e. translates from the world origin(0,0,0) to the anchor point of the view.
+ /// + public bool InheritPosition + { + get + { + bool temp = false; + GetProperty(View.Property.INHERIT_POSITION).Get(ref temp); + return temp; + } + set + { + SetProperty(View.Property.INHERIT_POSITION, new Tizen.NUI.PropertyValue(value)); + } + } + + /// + /// Gets/Sets clipping behavior(mode) of it's children. + /// + public ClippingModeType ClippingMode + { + get + { + string temp; + if (GetProperty(View.Property.CLIPPING_MODE).Get(out temp) == false) + { +#if DEBUG_ON + Tizen.Log.Error("NUI", "ClippingMode get error!"); +#endif + } + switch (temp) + { + case "DISABLED": + return ClippingModeType.Disabled; + case "CLIP_CHILDREN": + return ClippingModeType.ClipChildren; + default: + return ClippingModeType.Disabled; + } + } + set + { + SetProperty(View.Property.CLIPPING_MODE, new Tizen.NUI.PropertyValue((int)value)); + } + } } } diff --git a/src/Tizen.NUI/src/public/CameraActor.cs b/src/Tizen.NUI/src/public/CameraActor.cs deleted file mode 100755 index 9f6aa41..0000000 --- a/src/Tizen.NUI/src/public/CameraActor.cs +++ /dev/null @@ -1,595 +0,0 @@ -// Copyright (c) 2017 Samsung Electronics Co., Ltd. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// 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 - -namespace Tizen.NUI -{ - - /// - /// This class will be deprecated.
- /// CameraActor controls a camera.
- /// Allows the developer to use actor semantics to control a camera.
- /// NUI has a concept of a camera to display its virtual 3D world to a 2D screen.
- /// There are 2 ways of using the camera in NUI:
- /// - For 2D applications, you do not need to care about the camera at all. The default camera is already best suited for 2D applications - /// (configured to have the origin of the coordinate system at the top-left corner of the screen, and unit 1 as 1 pixel of the screen). This is a typical way.
- /// - For 3D applications, you can change the view by manipulating the camera.You can translate or rotate the camera in this case.
- /// Note that the top-left corner of the screen and unit 1 no longer are (0,0,0) and 1 pixel after manipulating the camera.
- /// There are two types of camera actor, FreeLook and LookAtTarget. By default, the camera actor will be FreeLook.
- /// - A FreeLook camera uses actor's orientation to control where the camera is looking.
- /// If no additional rotations are specified, the camera looks in the negative Z direction.
- /// - For LookAtTarget, the actor's orientation is ignored, instead the camera looks at TargetPosition in world coordinates.
- /// /// - public class CameraActor : Actor - { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - - internal CameraActor(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.CameraActor_SWIGUpcast(cPtr), cMemoryOwn) - { - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(CameraActor obj) - { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - /// - /// To make CameraActor instance be disposed. - /// - public override void Dispose() - { - if (!Stage.IsInstalled()) - { - DisposeQueue.Instance.Add(this); - return; - } - - lock (this) - { - if (swigCPtr.Handle != global::System.IntPtr.Zero) - { - if (swigCMemOwn) - { - swigCMemOwn = false; - NDalicPINVOKE.delete_CameraActor(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - global::System.GC.SuppressFinalize(this); - base.Dispose(); - } - } - - - internal class Property : global::System.IDisposable - { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) - { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) - { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - ~Property() - { - Dispose(); - } - - public virtual void Dispose() - { - lock (this) - { - if (swigCPtr.Handle != global::System.IntPtr.Zero) - { - if (swigCMemOwn) - { - swigCMemOwn = false; - NDalicPINVOKE.delete_CameraActor_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - global::System.GC.SuppressFinalize(this); - } - } - - internal Property() : this(NDalicPINVOKE.new_CameraActor_Property(), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal static readonly int TYPE = NDalicPINVOKE.CameraActor_Property_TYPE_get(); - internal static readonly int PROJECTION_MODE = NDalicPINVOKE.CameraActor_Property_PROJECTION_MODE_get(); - internal static readonly int FIELD_OF_VIEW = NDalicPINVOKE.CameraActor_Property_FIELD_OF_VIEW_get(); - internal static readonly int ASPECT_RATIO = NDalicPINVOKE.CameraActor_Property_ASPECT_RATIO_get(); - internal static readonly int NEAR_PLANE_DISTANCE = NDalicPINVOKE.CameraActor_Property_NEAR_PLANE_DISTANCE_get(); - internal static readonly int FAR_PLANE_DISTANCE = NDalicPINVOKE.CameraActor_Property_FAR_PLANE_DISTANCE_get(); - internal static readonly int LEFT_PLANE_DISTANCE = NDalicPINVOKE.CameraActor_Property_LEFT_PLANE_DISTANCE_get(); - internal static readonly int RIGHT_PLANE_DISTANCE = NDalicPINVOKE.CameraActor_Property_RIGHT_PLANE_DISTANCE_get(); - internal static readonly int TOP_PLANE_DISTANCE = NDalicPINVOKE.CameraActor_Property_TOP_PLANE_DISTANCE_get(); - internal static readonly int BOTTOM_PLANE_DISTANCE = NDalicPINVOKE.CameraActor_Property_BOTTOM_PLANE_DISTANCE_get(); - internal static readonly int TARGET_POSITION = NDalicPINVOKE.CameraActor_Property_TARGET_POSITION_get(); - internal static readonly int PROJECTION_MATRIX = NDalicPINVOKE.CameraActor_Property_PROJECTION_MATRIX_get(); - internal static readonly int VIEW_MATRIX = NDalicPINVOKE.CameraActor_Property_VIEW_MATRIX_get(); - internal static readonly int INVERT_Y_AXIS = NDalicPINVOKE.CameraActor_Property_INVERT_Y_AXIS_get(); - - } - - /// - /// Creates an initialized CameraActor handle. - /// - public CameraActor() : this(NDalicPINVOKE.CameraActor_New__SWIG_0(), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - - } - - /// - /// Creates a CameraActor object.
- /// Sets the default camera perspective projection for the given canvas size.
- /// - /// The canvas size - public CameraActor(Size2D size) : this(NDalicPINVOKE.CameraActor_New__SWIG_1(Size2D.getCPtr(size)), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - - } - - /// - /// Downcasts a handle to CameraActor handle.
- /// If handle points to a CameraActor, the downcast produces valid handle.
- /// If not, the returned handle is left uninitialized.
- /// - /// to An object - /// Handle to a CameraActor or an uninitialized handle - public new static CameraActor DownCast(BaseHandle handle) - { - CameraActor ret = new CameraActor(NDalicPINVOKE.CameraActor_DownCast(BaseHandle.getCPtr(handle)), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal CameraActor(CameraActor copy) : this(NDalicPINVOKE.new_CameraActor__SWIG_1(CameraActor.getCPtr(copy)), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal CameraActor Assign(CameraActor rhs) - { - CameraActor ret = new CameraActor(NDalicPINVOKE.CameraActor_Assign(swigCPtr, CameraActor.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal void SetType(CameraType type) - { - NDalicPINVOKE.CameraActor_SetType(swigCPtr, (int)type); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal CameraType GetType() - { - CameraType ret = (CameraType)NDalicPINVOKE.CameraActor_GetType(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal void SetProjectionMode(ProjectionMode mode) - { - NDalicPINVOKE.CameraActor_SetProjectionMode(swigCPtr, (int)mode); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal ProjectionMode GetProjectionMode() - { - ProjectionMode ret = (ProjectionMode)NDalicPINVOKE.CameraActor_GetProjectionMode(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal void SetFieldOfView(float fieldOfView) - { - NDalicPINVOKE.CameraActor_SetFieldOfView(swigCPtr, fieldOfView); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal float GetFieldOfView() - { - float ret = NDalicPINVOKE.CameraActor_GetFieldOfView(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal void SetAspectRatio(float aspectRatio) - { - NDalicPINVOKE.CameraActor_SetAspectRatio(swigCPtr, aspectRatio); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal float GetAspectRatio() - { - float ret = NDalicPINVOKE.CameraActor_GetAspectRatio(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal void SetNearClippingPlane(float nearClippingPlane) - { - NDalicPINVOKE.CameraActor_SetNearClippingPlane(swigCPtr, nearClippingPlane); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal float GetNearClippingPlane() - { - float ret = NDalicPINVOKE.CameraActor_GetNearClippingPlane(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal void SetFarClippingPlane(float farClippingPlane) - { - NDalicPINVOKE.CameraActor_SetFarClippingPlane(swigCPtr, farClippingPlane); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal float GetFarClippingPlane() - { - float ret = NDalicPINVOKE.CameraActor_GetFarClippingPlane(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal void SetTargetPosition(Vector3 targetPosition) - { - NDalicPINVOKE.CameraActor_SetTargetPosition(swigCPtr, Vector3.getCPtr(targetPosition)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal Vector3 GetTargetPosition() - { - Vector3 ret = new Vector3(NDalicPINVOKE.CameraActor_GetTargetPosition(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal void SetInvertYAxis(bool invertYAxis) - { - NDalicPINVOKE.CameraActor_SetInvertYAxis(swigCPtr, invertYAxis); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal bool GetInvertYAxis() - { - bool ret = NDalicPINVOKE.CameraActor_GetInvertYAxis(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal void SetPerspectiveProjection(Vector2 size) - { - NDalicPINVOKE.CameraActor_SetPerspectiveProjection(swigCPtr, Vector2.getCPtr(size)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal void SetOrthographicProjection(Vector2 size) - { - NDalicPINVOKE.CameraActor_SetOrthographicProjection__SWIG_0(swigCPtr, Vector2.getCPtr(size)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal void SetOrthographicProjection(float left, float right, float top, float bottom, float near, float far) - { - NDalicPINVOKE.CameraActor_SetOrthographicProjection__SWIG_1(swigCPtr, left, right, top, bottom, near, far); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - /// - /// Gets/Sets the camera type. The default type is FreeLook - /// - public CameraType Type - { - get - { - string temp; - if (GetProperty(CameraActor.Property.TYPE).Get(out temp) == false) - { -#if DEBUG_ON - Tizen.Log.Error("NUI", "CameraType get error!"); -#endif - } - switch (temp) - { - case "LOOK_AT_TARGET": - return CameraType.LookAtTarget; - case "FREE_LOOK": - return CameraType.FreeLook; - default: - return CameraType.FreeLook; - } - } - set - { - string valueToString = ""; - switch (value) - { - case CameraType.LookAtTarget: - { - valueToString = "LOOK_AT_TARGET"; - break; - } - case CameraType.FreeLook: - { - valueToString = "FREE_LOOK"; - break; - } - default: - { - valueToString = "FREE_LOOK"; - break; - } - } - SetProperty(CameraActor.Property.TYPE, new Tizen.NUI.PropertyValue(valueToString)); - } - } - - /// - /// Gets/Sets the projection mode. - /// - public ProjectionMode ProjectionMode - { - get - { - string temp; - if (GetProperty(CameraActor.Property.PROJECTION_MODE).Get(out temp) == false) - { -#if DEBUG_ON - Tizen.Log.Error("NUI", "ProjectionMode get error!"); -#endif - } - switch(temp) - { - case "PERSPECTIVE_PROJECTION": - return ProjectionMode.PerspectiveProjection; - case "ORTHOGRAPHIC_PROJECTION": - return ProjectionMode.OrthographicProjection; - default: - return ProjectionMode.PerspectiveProjection; - } - } - set - { - string valueToString = ""; - switch (value) - { - case ProjectionMode.PerspectiveProjection: - { - valueToString = "PERSPECTIVE_PROJECTION"; - break; - } - case ProjectionMode.OrthographicProjection: - { - valueToString = "ORTHOGRAPHIC_PROJECTION"; - break; - } - default: - { - valueToString = "PERSPECTIVE_PROJECTION"; - break; - } - } - SetProperty(CameraActor.Property.PROJECTION_MODE, new Tizen.NUI.PropertyValue(valueToString)); - } - } - - /// - /// Gets/Sets the field of view. - /// - public float FieldOfView - { - get - { - float temp = 0.0f; - GetProperty(CameraActor.Property.FIELD_OF_VIEW).Get(ref temp); - return temp; - } - set - { - SetProperty(CameraActor.Property.FIELD_OF_VIEW, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Gets/Sets the aspect ratio of the camera. - /// - public float AspectRatio - { - get - { - float temp = 0.0f; - GetProperty(CameraActor.Property.ASPECT_RATIO).Get(ref temp); - return temp; - } - set - { - SetProperty(CameraActor.Property.ASPECT_RATIO, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Gets/Sets near plane distance. - /// - public float NearPlaneDistance - { - get - { - float temp = 0.0f; - GetProperty(CameraActor.Property.NEAR_PLANE_DISTANCE).Get(ref temp); - return temp; - } - set - { - SetProperty(CameraActor.Property.NEAR_PLANE_DISTANCE, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Gets/Sets far plane distance. - /// - public float FarPlaneDistance - { - get - { - float temp = 0.0f; - GetProperty(CameraActor.Property.FAR_PLANE_DISTANCE).Get(ref temp); - return temp; - } - set - { - SetProperty(CameraActor.Property.FAR_PLANE_DISTANCE, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Gets/Sets left plane distance. - /// - public float LeftPlaneDistance - { - get - { - float temp = 0.0f; - GetProperty(CameraActor.Property.LEFT_PLANE_DISTANCE).Get(ref temp); - return temp; - } - set - { - SetProperty(CameraActor.Property.LEFT_PLANE_DISTANCE, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Gets/Sets right plane distance. - /// - public float RightPlaneDistance - { - get - { - float temp = 0.0f; - GetProperty(CameraActor.Property.RIGHT_PLANE_DISTANCE).Get(ref temp); - return temp; - } - set - { - SetProperty(CameraActor.Property.RIGHT_PLANE_DISTANCE, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Gets/Sets top plane distance. - /// - public float TopPlaneDistance - { - get - { - float temp = 0.0f; - GetProperty(CameraActor.Property.TOP_PLANE_DISTANCE).Get(ref temp); - return temp; - } - set - { - SetProperty(CameraActor.Property.TOP_PLANE_DISTANCE, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Gets/Sets bottom plane distance. - /// - public float BottomPlaneDistance - { - get - { - float temp = 0.0f; - GetProperty(CameraActor.Property.BOTTOM_PLANE_DISTANCE).Get(ref temp); - return temp; - } - set - { - SetProperty(CameraActor.Property.BOTTOM_PLANE_DISTANCE, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Gets/Sets the target position of the camera. - /// - public Position TargetPosition - { - get - { - Position temp = new Position(0.0f, 0.0f, 0.0f); - GetProperty(CameraActor.Property.TARGET_POSITION).Get(temp); - return temp; - } - set - { - SetProperty(CameraActor.Property.TARGET_POSITION, new Tizen.NUI.PropertyValue(value)); - } - } - internal Matrix ProjectionMatrix - { - get - { - Matrix temp = new Matrix(); - GetProperty(CameraActor.Property.PROJECTION_MATRIX).Get(temp); - return temp; - } - } - - internal Matrix ViewMatrix - { - get - { - Matrix temp = new Matrix(); - GetProperty(CameraActor.Property.VIEW_MATRIX).Get(temp); - return temp; - } - } - - /// - /// Requests for an inversion on the Y axis on the projection calculation. - /// - public bool InvertYAxis - { - get - { - bool temp = false; - GetProperty(CameraActor.Property.INVERT_Y_AXIS).Get(ref temp); - return temp; - } - set - { - SetProperty(CameraActor.Property.INVERT_Y_AXIS, new Tizen.NUI.PropertyValue(value)); - } - } - - } -} diff --git a/src/Tizen.NUI/src/public/Color.cs b/src/Tizen.NUI/src/public/Color.cs index 38100f3..3aedcc1 100755 --- a/src/Tizen.NUI/src/public/Color.cs +++ b/src/Tizen.NUI/src/public/Color.cs @@ -50,7 +50,7 @@ namespace Tizen.NUI /// public virtual void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; diff --git a/src/Tizen.NUI/src/public/Degree.cs b/src/Tizen.NUI/src/public/Degree.cs index 1de738b..f461c66 100755 --- a/src/Tizen.NUI/src/public/Degree.cs +++ b/src/Tizen.NUI/src/public/Degree.cs @@ -36,7 +36,7 @@ namespace Tizen.NUI } public virtual void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; diff --git a/src/Tizen.NUI/src/public/FlexContainer.cs b/src/Tizen.NUI/src/public/FlexContainer.cs index e582d63..30bc27f 100755 --- a/src/Tizen.NUI/src/public/FlexContainer.cs +++ b/src/Tizen.NUI/src/public/FlexContainer.cs @@ -50,7 +50,7 @@ namespace Tizen.NUI public override void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; @@ -91,11 +91,16 @@ namespace Tizen.NUI ~Property() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock (this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) @@ -146,11 +151,16 @@ namespace Tizen.NUI ~ChildProperty() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock (this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) @@ -219,7 +229,7 @@ namespace Tizen.NUI /// /// Enumeration for the primary direction in which content is ordered in the flex container - /// and on which sides the ?œstart??and ?œend??are. + /// and on which sides the ?�start??and ?�end??are. /// public enum ContentDirectionType { diff --git a/src/Tizen.NUI/src/public/FocusManager.cs b/src/Tizen.NUI/src/public/FocusManager.cs index c5a22a6..627dd15 100755 --- a/src/Tizen.NUI/src/public/FocusManager.cs +++ b/src/Tizen.NUI/src/public/FocusManager.cs @@ -49,7 +49,7 @@ namespace Tizen.NUI /// public override void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; @@ -125,8 +125,8 @@ namespace Tizen.NUI /// /// PreFocusChange will be triggered before the focus is going to be changed.
- /// FocusManager makes the best guess for which actor to focus towards the given direction, but applications might want to change that.
- /// By connecting with this event, they can check the proposed actor to focus and return a different actor if they wish.
+ /// FocusManager makes the best guess for which view to focus towards the given direction, but applications might want to change that.
+ /// By connecting with this event, they can check the proposed view to focus and return a different view if they wish.
/// This event is only triggered when the navigation key is pressed and KeyboardFocusManager tries to move the focus automatically.
/// It won't be emitted for focus movement by calling SetCurrentFocusView directly.
/// @@ -172,8 +172,14 @@ namespace Tizen.NUI View view = null; PreFocusChangeEventArgs e = new PreFocusChangeEventArgs(); - e.CurrentView = View.GetViewFromPtr(current); - e.ProposedView = View.GetViewFromPtr(proposed); + if (current != global::System.IntPtr.Zero) + { + e.CurrentView = View.GetViewFromPtr(current); + } + if (proposed != global::System.IntPtr.Zero) + { + e.ProposedView = View.GetViewFromPtr(proposed); + } e.Direction = direction; if (_preFocusChangeEventHandler != null) @@ -183,12 +189,13 @@ namespace Tizen.NUI if (view) { - return view.GetPtrfromActor(); + return view.GetPtrfromView(); } else { - if (e.ProposedView) return proposed; - else return current; + //if (e.ProposedView) return proposed; + //else return current; + return current; //xb.teng } } @@ -231,7 +238,7 @@ namespace Tizen.NUI private FocusChangedEventCallback _focusChangedEventCallback; /// - /// FocusGroupChanged will be triggered after the current focused actor has been changed. + /// FocusGroupChanged will be triggered after the current focused view has been changed. /// public event EventHandler FocusChanged { @@ -372,7 +379,7 @@ namespace Tizen.NUI private FocusedViewEnterKeyEventCallback _focusedViewEnterKeyEventCallback; /// - /// FocusedViewEnterKeyPressed will be triggered when the current focused actor has the enter key pressed on it. + /// FocusedViewEnterKeyPressed will be triggered when the current focused view has the enter key pressed on it. /// public event EventHandler FocusedViewEnterKeyPressed { @@ -381,7 +388,7 @@ namespace Tizen.NUI if (_focusedViewEnterKeyEventCallback == null) { _focusedViewEnterKeyEventCallback = OnFocusedViewEnterKey; - FocusedActorEnterKeySignal().Connect(_focusedViewEnterKeyEventCallback); + FocusedViewEnterKeySignal().Connect(_focusedViewEnterKeyEventCallback); } _focusedViewEnterKeyEventHandler += value; } @@ -389,9 +396,9 @@ namespace Tizen.NUI { _focusedViewEnterKeyEventHandler -= value; - if (_focusedViewEnterKeyEventCallback == null && FocusedActorEnterKeySignal().Empty() == false) + if (_focusedViewEnterKeyEventCallback == null && FocusedViewEnterKeySignal().Empty() == false) { - FocusedActorEnterKeySignal().Disconnect(_focusedViewEnterKeyEventCallback); + FocusedViewEnterKeySignal().Disconnect(_focusedViewEnterKeyEventCallback); } } } @@ -430,18 +437,18 @@ namespace Tizen.NUI /// Whether the focus is successful or not public bool SetCurrentFocusView(View view) { - bool ret = NDalicManualPINVOKE.FocusManager_SetCurrentFocusActor(swigCPtr, Actor.getCPtr(view)); + bool ret = NDalicManualPINVOKE.FocusManager_SetCurrentFocusActor(swigCPtr, View.getCPtr(view)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } /// - /// Gets the current focused actor. + /// Gets the current focused view. /// /// A handle to the current focused View or an empty handle if no View is focused public View GetCurrentFocusView() { - View ret = View.DownCast(new Actor(NDalicManualPINVOKE.FocusManager_GetCurrentFocusActor(swigCPtr), true)); + View ret = new View(NDalicManualPINVOKE.FocusManager_GetCurrentFocusActor(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); if (ret.HasBody() == false) { @@ -463,7 +470,7 @@ namespace Tizen.NUI } /// - /// Clears the focus from the current focused actor if any, so that no actor is focused in the focus chain.
+ /// Clears the focus from the current focused view if any, so that no view is focused in the focus chain.
/// It will emit FocusChanged event without current focused View.
/// public void ClearFocus() @@ -502,37 +509,37 @@ namespace Tizen.NUI } /// - /// Sets whether an View is a focus group that can limit the scope of focus movement to its child actors in the focus chain.
+ /// Sets whether an View is a focus group that can limit the scope of focus movement to its child views in the focus chain.
/// Layout controls set themselves as focus groups by default.
/// /// The View to be set as a focus group /// Whether to set the View as a focus group or not public void SetAsFocusGroup(View view, bool isFocusGroup) { - NDalicManualPINVOKE.FocusManager_SetAsFocusGroup(swigCPtr, Actor.getCPtr(view), isFocusGroup); + NDalicManualPINVOKE.FocusManager_SetAsFocusGroup(swigCPtr, View.getCPtr(view), isFocusGroup); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } /// - /// Checks whether the actor is set as a focus group or not. + /// Checks whether the view is set as a focus group or not. /// /// The View to be checked /// Whether the View is set as a focus group public bool IsFocusGroup(View view) { - bool ret = NDalicManualPINVOKE.FocusManager_IsFocusGroup(swigCPtr, Actor.getCPtr(view)); + bool ret = NDalicManualPINVOKE.FocusManager_IsFocusGroup(swigCPtr, View.getCPtr(view)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } /// - /// Returns the closest ancestor of the given actor that is a focus group. + /// Returns the closest ancestor of the given view that is a focus group. /// /// The View to be checked for its focus group /// The focus group the given view belongs to or an empty handle if the given view public View GetFocusGroup(View view) { - View ret = View.DownCast(new Actor(NDalicManualPINVOKE.FocusManager_GetFocusGroup(swigCPtr, Actor.getCPtr(view)), true)); + View ret = new View(NDalicManualPINVOKE.FocusManager_GetFocusGroup(swigCPtr, View.getCPtr(view)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); if (ret.HasBody() == false) { @@ -559,13 +566,13 @@ namespace Tizen.NUI internal void SetFocusIndicatorView(View indicator) { - NDalicManualPINVOKE.FocusManager_SetFocusIndicatorActor(swigCPtr, Actor.getCPtr(indicator)); + NDalicManualPINVOKE.FocusManager_SetFocusIndicatorActor(swigCPtr, View.getCPtr(indicator)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } internal View GetFocusIndicatorView() { - View ret = View.DownCast(new Actor(NDalicManualPINVOKE.FocusManager_GetFocusIndicatorActor(swigCPtr), true)); + View ret = new View(NDalicManualPINVOKE.FocusManager_GetFocusIndicatorActor(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); if (ret.HasBody() == false) { @@ -608,9 +615,9 @@ namespace Tizen.NUI return ret; } - internal ActorSignal FocusedActorEnterKeySignal() + internal ViewSignal FocusedViewEnterKeySignal() { - ActorSignal ret = new ActorSignal(NDalicManualPINVOKE.FocusManager_FocusedActorEnterKeySignal(swigCPtr), false); + ViewSignal ret = new ViewSignal(NDalicManualPINVOKE.FocusManager_FocusedActorEnterKeySignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } @@ -629,15 +636,15 @@ namespace Tizen.NUI } /// - /// ICustomFocusAlgorithm is used to provide custom keyboard focus algorithm for retrieving the next focusable actor.
+ /// ICustomFocusAlgorithm is used to provide custom keyboard focus algorithm for retrieving the next focusable view.
/// The application can implement the interface and override the keyboard focus behaviour.
- /// If focus is changing within a layout container, then the layout container is queried first to provide the next focusable actor.
- /// If this does not provide a valid actor, then the Keyboard FocusManager will check focusable properties to determine next focusable actor.
- /// If focusable properties are not set, then the Keyboard FocusManager calls the GetNextFocusableActor() method of this interface.
+ /// If focus is changing within a layout container, then the layout container is queried first to provide the next focusable view.
+ /// If this does not provide a valid view, then the Keyboard FocusManager will check focusable properties to determine next focusable actor.
+ /// If focusable properties are not set, then the Keyboard FocusManager calls the GetNextFocusableView() method of this interface.
/// public interface ICustomFocusAlgorithm { - View GetNextFocusableActor(View current, View proposed, View.FocusDirection direction); + View GetNextFocusableView(View current, View proposed, View.FocusDirection direction); } private class CustomAlgorithmInterfaceWrapper : CustomAlgorithmInterface @@ -653,11 +660,11 @@ namespace Tizen.NUI _customFocusAlgorithm = customFocusAlgorithm; } - public override Actor GetNextFocusableActor(Actor current, Actor proposed, View.FocusDirection direction) + public override View GetNextFocusableView(View current, View proposed, View.FocusDirection direction) { View currentView = View.DownCast(current); View proposedView = View.DownCast(proposed); - return _customFocusAlgorithm.GetNextFocusableActor(currentView, proposedView, direction); + return _customFocusAlgorithm.GetNextFocusableView(currentView, proposedView, direction); } } } diff --git a/src/Tizen.NUI/src/public/Gesture.cs b/src/Tizen.NUI/src/public/Gesture.cs index 97fbcf0..3d02f45 100755 --- a/src/Tizen.NUI/src/public/Gesture.cs +++ b/src/Tizen.NUI/src/public/Gesture.cs @@ -39,7 +39,7 @@ namespace Tizen.NUI public virtual void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; diff --git a/src/Tizen.NUI/src/public/Hover.cs b/src/Tizen.NUI/src/public/Hover.cs index 4ccdafa..7ae04de 100755 --- a/src/Tizen.NUI/src/public/Hover.cs +++ b/src/Tizen.NUI/src/public/Hover.cs @@ -10,7 +10,7 @@ namespace Tizen.NUI { - + using Tizen.NUI.BaseComponents; /// /// Hover events are a collection of points at a specific moment in time.
/// When a multi event occurs, each point represents the points that are currently being @@ -39,7 +39,7 @@ namespace Tizen.NUI public virtual void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; @@ -110,30 +110,30 @@ namespace Tizen.NUI } /// - /// Retrieves the actor that was underneath the point specified. + /// Retrieves the view that was underneath the point specified. /// /// The point required - /// The actor that was underneath the point specified - public Actor GetHitActor(uint point) + /// The view that was underneath the point specified + public View GetHitView(uint point) { if (point < points.Count) { - return points[(int)point].hitActor; + return points[(int)point].hitView; } else { // Return a native empty handle - Actor actor = new Actor(); - actor.Reset(); - return actor; + View view = new View(); + view.Reset(); + return view; } } /// - /// Retrieves the co-ordinates relative to the top-left of the hit-actor at the point specified. + /// Retrieves the co-ordinates relative to the top-left of the hit-view at the point specified. /// /// The point required - /// The co-ordinates relative to the top-left of the hit-actor of the point specified + /// The co-ordinates relative to the top-left of the hit-view of the point specified public Vector2 GetLocalPosition(uint point) { if (point < points.Count) diff --git a/src/Tizen.NUI/src/public/Key.cs b/src/Tizen.NUI/src/public/Key.cs index 33b0b71..fdf845e 100755 --- a/src/Tizen.NUI/src/public/Key.cs +++ b/src/Tizen.NUI/src/public/Key.cs @@ -37,7 +37,7 @@ namespace Tizen.NUI public virtual void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; diff --git a/src/Tizen.NUI/src/public/KeyFrames.cs b/src/Tizen.NUI/src/public/KeyFrames.cs index e3630bf..64c0f64 100755 --- a/src/Tizen.NUI/src/public/KeyFrames.cs +++ b/src/Tizen.NUI/src/public/KeyFrames.cs @@ -47,7 +47,7 @@ namespace Tizen.NUI public override void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; diff --git a/src/Tizen.NUI/src/public/Layer.cs b/src/Tizen.NUI/src/public/Layer.cs index 7c9b8ac..a89b498 100755 --- a/src/Tizen.NUI/src/public/Layer.cs +++ b/src/Tizen.NUI/src/public/Layer.cs @@ -26,11 +26,11 @@ namespace Tizen.NUI { - + using Tizen.NUI.BaseComponents; /// /// Layers provide a mechanism for overlaying groups of actors on top of each other. /// - public class Layer : Actor + public class Layer : Animatable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; @@ -44,9 +44,9 @@ namespace Tizen.NUI return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; } - public override void Dispose() + public virtual void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; @@ -64,7 +64,7 @@ namespace Tizen.NUI swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); } global::System.GC.SuppressFinalize(this); - base.Dispose(); + //base.Dispose(); //xb.teng } } @@ -87,11 +87,16 @@ namespace Tizen.NUI ~Property() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock (this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) @@ -152,6 +157,28 @@ namespace Tizen.NUI return ret; } + public View FindChildById(uint id) + { + View ret = new View(NDalicPINVOKE.Actor_FindChildById(swigCPtr, id), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public void Add(View child) + { + NDalicPINVOKE.Actor_Add(swigCPtr, View.getCPtr(child)); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public void Remove(View child) + { + NDalicPINVOKE.Actor_Remove(swigCPtr, View.getCPtr(child)); + if (NDalicPINVOKE.SWIGPendingException.Pending) + throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + /// /// Queries the depth of the layer.
/// 0 is the bottom most layer, higher number is on top.
diff --git a/src/Tizen.NUI/src/public/LongPressGesture.cs b/src/Tizen.NUI/src/public/LongPressGesture.cs index ff05444..318bf9d 100755 --- a/src/Tizen.NUI/src/public/LongPressGesture.cs +++ b/src/Tizen.NUI/src/public/LongPressGesture.cs @@ -31,7 +31,7 @@ namespace Tizen.NUI public override void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; diff --git a/src/Tizen.NUI/src/public/NUIApplication.cs b/src/Tizen.NUI/src/public/NUIApplication.cs index c7c09e2..420c1ce 100755 --- a/src/Tizen.NUI/src/public/NUIApplication.cs +++ b/src/Tizen.NUI/src/public/NUIApplication.cs @@ -65,7 +65,7 @@ namespace Tizen.NUI /// /// The instance of the Dali Stage. /// - private Stage _stage; + private Window _window; /// /// The default constructor. @@ -139,8 +139,8 @@ namespace Tizen.NUI #if DEBUG_ON Tizen.Log.Debug("NUI", "##### 2) DisposeQueue.Instance.Initialize()!"); #endif - _stage = Stage.Instance; - _stage.SetBackgroundColor(Color.White); + _window = Window.Instance; + _window.SetBackgroundColor(Color.White); LOG("OnPreCreate() is called!"); } diff --git a/src/Tizen.NUI/src/public/NUIConstants.cs b/src/Tizen.NUI/src/public/NUIConstants.cs index f0b7ecb..b2953e6 100755 --- a/src/Tizen.NUI/src/public/NUIConstants.cs +++ b/src/Tizen.NUI/src/public/NUIConstants.cs @@ -88,7 +88,7 @@ namespace Tizen.NUI /// /// Size is to use the actor's natural size /// - /// + /// UseNaturalSize, /// /// Size is to fill up to the actor's parent's bounds. Aspect ratio is not maintained. diff --git a/src/Tizen.NUI/src/public/PanGesture.cs b/src/Tizen.NUI/src/public/PanGesture.cs index 14fc529..215a5ac 100755 --- a/src/Tizen.NUI/src/public/PanGesture.cs +++ b/src/Tizen.NUI/src/public/PanGesture.cs @@ -36,7 +36,7 @@ namespace Tizen.NUI public override void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; diff --git a/src/Tizen.NUI/src/public/Path.cs b/src/Tizen.NUI/src/public/Path.cs index 7486acd..5e45f61 100755 --- a/src/Tizen.NUI/src/public/Path.cs +++ b/src/Tizen.NUI/src/public/Path.cs @@ -31,7 +31,7 @@ namespace Tizen.NUI /// A 3D parametric curve.
/// Paths can be used to animate position and orientation of actors.
/// - public class Path : Handle + public class Path : BaseHandle { private global::System.Runtime.InteropServices.HandleRef swigCPtr; @@ -47,7 +47,7 @@ namespace Tizen.NUI public override void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; @@ -88,11 +88,16 @@ namespace Tizen.NUI ~Property() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock (this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) @@ -239,12 +244,12 @@ namespace Tizen.NUI get { Tizen.NUI.PropertyArray temp = new Tizen.NUI.PropertyArray(); - GetProperty(Path.Property.POINTS).Get(temp); + Tizen.NUI.Object.GetProperty(swigCPtr, Path.Property.POINTS).Get(temp); return temp; } set { - SetProperty(Path.Property.POINTS, new Tizen.NUI.PropertyValue(value)); + Tizen.NUI.Object.SetProperty(swigCPtr, Path.Property.POINTS, new Tizen.NUI.PropertyValue(value)); } } @@ -256,12 +261,12 @@ namespace Tizen.NUI get { Tizen.NUI.PropertyArray temp = new Tizen.NUI.PropertyArray(); - GetProperty(Path.Property.CONTROL_POINTS).Get(temp); + Tizen.NUI.Object.GetProperty(swigCPtr, Path.Property.CONTROL_POINTS).Get(temp); return temp; } set { - SetProperty(Path.Property.CONTROL_POINTS, new Tizen.NUI.PropertyValue(value)); + Tizen.NUI.Object.SetProperty(swigCPtr, Path.Property.CONTROL_POINTS, new Tizen.NUI.PropertyValue(value)); } } diff --git a/src/Tizen.NUI/src/public/PinchGesture.cs b/src/Tizen.NUI/src/public/PinchGesture.cs index 12a8d19..2ef419c 100755 --- a/src/Tizen.NUI/src/public/PinchGesture.cs +++ b/src/Tizen.NUI/src/public/PinchGesture.cs @@ -31,7 +31,7 @@ namespace Tizen.NUI public override void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; diff --git a/src/Tizen.NUI/src/public/Position.cs b/src/Tizen.NUI/src/public/Position.cs index 4075eb4..b175355 100755 --- a/src/Tizen.NUI/src/public/Position.cs +++ b/src/Tizen.NUI/src/public/Position.cs @@ -44,7 +44,7 @@ namespace Tizen.NUI public virtual void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; diff --git a/src/Tizen.NUI/src/public/Position2D.cs b/src/Tizen.NUI/src/public/Position2D.cs index 009f669..c4c3a07 100755 --- a/src/Tizen.NUI/src/public/Position2D.cs +++ b/src/Tizen.NUI/src/public/Position2D.cs @@ -38,7 +38,7 @@ public class Position2D : global::System.IDisposable { } public virtual void Dispose() { - if (!Stage.IsInstalled()) { + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; } diff --git a/src/Tizen.NUI/src/public/Property.cs b/src/Tizen.NUI/src/public/Property.cs index b697a36..b55948c 100755 --- a/src/Tizen.NUI/src/public/Property.cs +++ b/src/Tizen.NUI/src/public/Property.cs @@ -34,7 +34,7 @@ namespace Tizen.NUI public virtual void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; @@ -91,7 +91,7 @@ namespace Tizen.NUI /// /// A valid handle to the target object /// The index of a property - public Property(Handle arg0, int propertyIndex) : this(NDalicPINVOKE.new_Property__SWIG_0(Handle.getCPtr(arg0), propertyIndex), true) + public Property(Animatable arg0, int propertyIndex) : this(NDalicPINVOKE.new_Property__SWIG_0(Animatable.getCPtr(arg0), propertyIndex), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -102,7 +102,7 @@ namespace Tizen.NUI /// A valid handle to the target object /// The index of a property /// Index to a sub component of a property, for use with Vector2, Vector3 and Vector4. -1 for main property (default is -1) - public Property(Handle arg0, int propertyIndex, int componentIndex) : this(NDalicPINVOKE.new_Property__SWIG_1(Handle.getCPtr(arg0), propertyIndex, componentIndex), true) + public Property(Animatable arg0, int propertyIndex, int componentIndex) : this(NDalicPINVOKE.new_Property__SWIG_1(Animatable.getCPtr(arg0), propertyIndex, componentIndex), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -113,7 +113,7 @@ namespace Tizen.NUI /// /// A valid handle to the target object /// The property name - public Property(Handle arg0, string propertyName) : this(NDalicPINVOKE.new_Property__SWIG_2(Handle.getCPtr(arg0), propertyName), true) + public Property(Animatable arg0, string propertyName) : this(NDalicPINVOKE.new_Property__SWIG_2(Animatable.getCPtr(arg0), propertyName), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -125,21 +125,21 @@ namespace Tizen.NUI /// A valid handle to the target object /// The property name /// Index to a sub component of a property, for use with Vector2, Vector3 and Vector4. -1 for main property (default is -1) - public Property(Handle arg0, string propertyName, int componentIndex) : this(NDalicPINVOKE.new_Property__SWIG_3(Handle.getCPtr(arg0), propertyName, componentIndex), true) + public Property(Animatable arg0, string propertyName, int componentIndex) : this(NDalicPINVOKE.new_Property__SWIG_3(Animatable.getCPtr(arg0), propertyName, componentIndex), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal Handle _object + internal Animatable _object { set { - NDalicPINVOKE.Property__object_set(swigCPtr, Handle.getCPtr(value)); + NDalicPINVOKE.Property__object_set(swigCPtr, Animatable.getCPtr(value)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } get { - Handle ret = new Handle(NDalicPINVOKE.Property__object_get(swigCPtr), false); + Animatable ret = new Animatable(NDalicPINVOKE.Property__object_get(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } @@ -204,11 +204,16 @@ namespace Tizen.NUI ~PropertyArray() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock (this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) @@ -403,11 +408,16 @@ namespace Tizen.NUI ~PropertyKey() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock (this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) @@ -599,11 +609,16 @@ namespace Tizen.NUI ~PropertyMap() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock (this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) @@ -928,11 +943,16 @@ namespace Tizen.NUI ~PropertyValue() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock (this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) diff --git a/src/Tizen.NUI/src/public/Radian.cs b/src/Tizen.NUI/src/public/Radian.cs index 4282a39..87f5e40 100755 --- a/src/Tizen.NUI/src/public/Radian.cs +++ b/src/Tizen.NUI/src/public/Radian.cs @@ -37,7 +37,7 @@ namespace Tizen.NUI public virtual void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; diff --git a/src/Tizen.NUI/src/public/Rectangle.cs b/src/Tizen.NUI/src/public/Rectangle.cs index ff0214c..cdba783 100755 --- a/src/Tizen.NUI/src/public/Rectangle.cs +++ b/src/Tizen.NUI/src/public/Rectangle.cs @@ -37,7 +37,7 @@ namespace Tizen.NUI public virtual void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; diff --git a/src/Tizen.NUI/src/public/RelativeVector2.cs b/src/Tizen.NUI/src/public/RelativeVector2.cs index 0bd3e67..68f8612 100755 --- a/src/Tizen.NUI/src/public/RelativeVector2.cs +++ b/src/Tizen.NUI/src/public/RelativeVector2.cs @@ -46,7 +46,7 @@ namespace Tizen.NUI public virtual void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; diff --git a/src/Tizen.NUI/src/public/RelativeVector3.cs b/src/Tizen.NUI/src/public/RelativeVector3.cs index 7116b85..324df2a 100755 --- a/src/Tizen.NUI/src/public/RelativeVector3.cs +++ b/src/Tizen.NUI/src/public/RelativeVector3.cs @@ -46,7 +46,7 @@ namespace Tizen.NUI public virtual void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; diff --git a/src/Tizen.NUI/src/public/RelativeVector4.cs b/src/Tizen.NUI/src/public/RelativeVector4.cs index 82038bf..390c0e8 100755 --- a/src/Tizen.NUI/src/public/RelativeVector4.cs +++ b/src/Tizen.NUI/src/public/RelativeVector4.cs @@ -46,7 +46,7 @@ namespace Tizen.NUI public virtual void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; diff --git a/src/Tizen.NUI/src/public/RelayoutContainer.cs b/src/Tizen.NUI/src/public/RelayoutContainer.cs index 379a50e..59e9bdf 100755 --- a/src/Tizen.NUI/src/public/RelayoutContainer.cs +++ b/src/Tizen.NUI/src/public/RelayoutContainer.cs @@ -19,7 +19,7 @@ namespace Tizen.NUI { - + using Tizen.NUI.BaseComponents; /// /// Interface to encapsulate information required for relayout. /// @@ -49,7 +49,7 @@ namespace Tizen.NUI /// public virtual void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; @@ -73,11 +73,11 @@ namespace Tizen.NUI /// /// Adds relayout information to the container if it doesn't already exist. /// - /// The actor to relayout + /// The view to relayout /// The size to relayout - public virtual void Add(Actor actor, Size2D size) + public virtual void Add(View view, Size2D size) { - NDalicPINVOKE.RelayoutContainer_Add(swigCPtr, Actor.getCPtr(actor), Size2D.getCPtr(size)); + NDalicPINVOKE.RelayoutContainer_Add(swigCPtr, View.getCPtr(view), Size2D.getCPtr(size)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/src/Tizen.NUI/src/public/Rotation.cs b/src/Tizen.NUI/src/public/Rotation.cs index 5236f5d..a34fc28 100755 --- a/src/Tizen.NUI/src/public/Rotation.cs +++ b/src/Tizen.NUI/src/public/Rotation.cs @@ -40,7 +40,7 @@ namespace Tizen.NUI /// public virtual void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; diff --git a/src/Tizen.NUI/src/public/Size2D.cs b/src/Tizen.NUI/src/public/Size2D.cs index 1ae26fd..2893eb3 100755 --- a/src/Tizen.NUI/src/public/Size2D.cs +++ b/src/Tizen.NUI/src/public/Size2D.cs @@ -47,7 +47,7 @@ namespace Tizen.NUI /// public virtual void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; diff --git a/src/Tizen.NUI/src/public/Stage.cs b/src/Tizen.NUI/src/public/Stage.cs deleted file mode 100755 index 1639337..0000000 --- a/src/Tizen.NUI/src/public/Stage.cs +++ /dev/null @@ -1,691 +0,0 @@ -//------------------------------------------------------------------------------ -// -// -// 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; - - /// - /// The Stage is a top-level object used for displaying a tree of Actors.
- /// Stage is a top-level object that represents the entire screen.
- /// It is used for displaying a hierarchy of actors managed by the scene graph structure, - /// which means an actor inherits a position relative to its parent, - /// and can be moved in relation to this point.
- /// The stage instance is a singleton object (the only instance of its class during the - /// lifetime of the program). You can get it using a static function.
- /// To display the contents of an actor, it must be added to a stage.
- /// - public class Stage : BaseHandle - { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - - internal Stage(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Stage_SWIGUpcast(cPtr), cMemoryOwn) - { - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Stage obj) - { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - /// - /// Dispose. - /// - public override void Dispose() - { - if (!Stage.IsInstalled()) - { - DisposeQueue.Instance.Add(this); - return; - } - - lock (this) - { - if (swigCPtr.Handle != global::System.IntPtr.Zero) - { - if (swigCMemOwn) - { - swigCMemOwn = false; - NDalicPINVOKE.delete_Stage(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - global::System.GC.SuppressFinalize(this); - base.Dispose(); - } - } - - /// - /// Touch event argument. - /// - public class TouchEventArgs : EventArgs - { - private Touch _touch; - - /// - /// Touch. - /// - public Touch Touch - { - get - { - return _touch; - } - set - { - _touch = value; - } - } - } - - private event EventHandler _stageTouchHandler; - private EventCallbackDelegateType1 _stageTouchCallbackDelegate; - - /// - /// This is emitted when the screen is touched and when the touch ends.
- /// If there are multiple touch points, then this will be emitted when the first touch occurs and - /// then when the last finger is lifted.
- /// An interrupted event will also be emitted (if it occurs).
- /// - public event EventHandler Touch - { - add - { - if (_stageTouchHandler == null) - { - _stageTouchCallbackDelegate = OnStageTouch; - TouchSignal().Connect(_stageTouchCallbackDelegate); - } - _stageTouchHandler += value; - } - remove - { - _stageTouchHandler -= value; - if (_stageTouchHandler == null && TouchSignal().Empty() == false) - { - TouchSignal().Disconnect(_stageTouchCallbackDelegate); - } - } - } - - private void OnStageTouch(IntPtr data) - { - TouchEventArgs e = new TouchEventArgs(); - - if (data != null) - { - e.Touch = Tizen.NUI.Touch.GetTouchFromPtr(data); - } - - if (_stageTouchHandler != null) - { - _stageTouchHandler(this, e); - } - } - - /// - /// Wheel event arguments. - /// - public class WheelEventArgs : EventArgs - { - private Wheel _wheel; - - /// - /// Wheel. - /// - public Wheel Wheel - { - get - { - return _wheel; - } - set - { - _wheel = value; - } - } - } - - private event EventHandler _stageWheelHandler; - private EventCallbackDelegateType1 _stageWheelCallbackDelegate; - - /// - /// Event emitted when wheel event is received. - /// - public event EventHandler Wheel - { - add - { - if (_stageWheelHandler == null) - { - _stageWheelCallbackDelegate = OnStageWheel; - WheelEventSignal().Connect(_stageWheelCallbackDelegate); - } - _stageWheelHandler += value; - } - remove - { - _stageWheelHandler -= value; - if (_stageWheelHandler == null && WheelEventSignal().Empty() == false) - { - WheelEventSignal().Disconnect(_stageWheelCallbackDelegate); - } - } - } - - private void OnStageWheel(IntPtr data) - { - WheelEventArgs e = new WheelEventArgs(); - - if (data != null) - { - e.Wheel = Tizen.NUI.Wheel.GetWheelFromPtr(data); - } - - if (_stageWheelHandler != null) - { - _stageWheelHandler(this, e); - } - } - - /// - /// Key event arguments. - /// - public class KeyEventArgs : EventArgs - { - private Key _key; - - /// - /// Key - /// - public Key Key - { - get - { - return _key; - } - set - { - _key = value; - } - } - } - - private event EventHandler _stageKeyHandler; - private EventCallbackDelegateType1 _stageKeyCallbackDelegate; - - /// - /// Event emitted when key event is received. - /// - public event EventHandler Key - { - add - { - if (_stageKeyHandler == null) - { - _stageKeyCallbackDelegate = OnStageKey; - KeyEventSignal().Connect(_stageKeyCallbackDelegate); - } - _stageKeyHandler += value; - } - remove - { - _stageKeyHandler -= value; - if (_stageKeyHandler == null && KeyEventSignal().Empty() == false) - { - KeyEventSignal().Disconnect(_stageKeyCallbackDelegate); - } - } - } - - // Callback for Stage KeyEventsignal - private void OnStageKey(IntPtr data) - { - KeyEventArgs e = new KeyEventArgs(); - - if (data != null) - { - e.Key = Tizen.NUI.Key.GetKeyFromPtr(data); - } - - if (_stageKeyHandler != null) - { - //here we send all data to user event handlers - _stageKeyHandler(this, e); - } - } - - - private event EventHandler _stageEventProcessingFinishedEventHandler; - private EventCallbackDelegateType0 _stageEventProcessingFinishedEventCallbackDelegate; - - internal event EventHandler EventProcessingFinished - { - add - { - if (_stageEventProcessingFinishedEventHandler == null) - { - _stageEventProcessingFinishedEventCallbackDelegate = OnEventProcessingFinished; - EventProcessingFinishedSignal().Connect(_stageEventProcessingFinishedEventCallbackDelegate); - } - _stageEventProcessingFinishedEventHandler += value; - - } - remove - { - _stageEventProcessingFinishedEventHandler -= value; - if (_stageEventProcessingFinishedEventHandler == null && EventProcessingFinishedSignal().Empty() == false) - { - EventProcessingFinishedSignal().Disconnect(_stageEventProcessingFinishedEventCallbackDelegate); - } - } - } - - // Callback for Stage EventProcessingFinishedSignal - private void OnEventProcessingFinished() - { - if (_stageEventProcessingFinishedEventHandler != null) - { - _stageEventProcessingFinishedEventHandler(this, null); - } - } - - - private EventHandler _stageContextLostEventHandler; - private EventCallbackDelegateType0 _stageContextLostEventCallbackDelegate; - - internal event EventHandler ContextLost - { - add - { - if (_stageContextLostEventHandler == null) - { - _stageContextLostEventCallbackDelegate = OnContextLost; - ContextLostSignal().Connect(_stageContextLostEventCallbackDelegate); - } - _stageContextLostEventHandler += value; - } - remove - { - _stageContextLostEventHandler -= value; - if (_stageContextLostEventHandler == null && ContextLostSignal().Empty() == false) - { - ContextLostSignal().Disconnect(_stageContextLostEventCallbackDelegate); - } - } - } - - // Callback for Stage ContextLostSignal - private void OnContextLost() - { - if (_stageContextLostEventHandler != null) - { - _stageContextLostEventHandler(this, null); - } - } - - - private EventHandler _stageContextRegainedEventHandler; - private EventCallbackDelegateType0 _stageContextRegainedEventCallbackDelegate; - - internal event EventHandler ContextRegained - { - add - { - if (_stageContextRegainedEventHandler == null) - { - _stageContextRegainedEventCallbackDelegate = OnContextRegained; - ContextRegainedSignal().Connect(_stageContextRegainedEventCallbackDelegate); - } - _stageContextRegainedEventHandler += value; - } - remove - { - _stageContextRegainedEventHandler -= value; - if (_stageContextRegainedEventHandler == null && ContextRegainedSignal().Empty() == false) - { - this.ContextRegainedSignal().Disconnect(_stageContextRegainedEventCallbackDelegate); - } - } - } - - // Callback for Stage ContextRegainedSignal - private void OnContextRegained() - { - if (_stageContextRegainedEventHandler != null) - { - _stageContextRegainedEventHandler(this, null); - } - } - - - private EventHandler _stageSceneCreatedEventHandler; - private EventCallbackDelegateType0 _stageSceneCreatedEventCallbackDelegate; - - internal event EventHandler SceneCreated - { - add - { - if (_stageSceneCreatedEventHandler == null) - { - _stageSceneCreatedEventCallbackDelegate = OnSceneCreated; - SceneCreatedSignal().Connect(_stageSceneCreatedEventCallbackDelegate); - } - _stageSceneCreatedEventHandler += value; - } - remove - { - _stageSceneCreatedEventHandler -= value; - if (_stageSceneCreatedEventHandler == null && SceneCreatedSignal().Empty() == false) - { - SceneCreatedSignal().Disconnect(_stageSceneCreatedEventCallbackDelegate); - } - } - } - - // Callback for Stage SceneCreatedSignal - private void OnSceneCreated() - { - if (_stageSceneCreatedEventHandler != null) - { - _stageSceneCreatedEventHandler(this, null); - } - } - - /// - /// Stage size property (read-only). - /// - public Size2D Size - { - get - { - Size2D ret = GetSize(); - return ret; - } - } - - /// - /// Background color property. - /// - public Color BackgroundColor - { - set - { - SetBackgroundColor(value); - } - get - { - Color ret = GetBackgroundColor(); - return ret; - } - } - - /// - /// Dpi property (read-only).
- /// Retrieves the DPI of the display device to which the stage is connected.
- /// - public Vector2 Dpi - { - get - { - return GetDpi(); - } - } - - /// - /// Layer count property (read-only).
- /// Queries the number of on-stage layers.
- /// - public uint LayerCount - { - get - { - return GetLayerCount(); - } - } - - private static readonly Stage instance = Stage.GetCurrent(); - - /// - /// Stage instance property (read-only).
- /// Gets the current Stage.
- /// - public static Stage Instance - { - get - { - return instance; - } - } - - /// - /// Get default ( root ) layer. - /// - /// The root layer - public Layer GetDefaultLayer() - { - return this.GetRootLayer(); - } - - /// - /// Add layer to the Stage. - /// - /// Layer to add - public void AddLayer(Layer layer) - { - this.Add((Actor)layer); - } - - /// - /// Remove layer from the Stage. - /// - /// Layer to remove - public void RemoveLayer(Layer layer) - { - this.Remove((Actor)layer); - } - - internal static Vector4 DEFAULT_BACKGROUND_COLOR - { - get - { - global::System.IntPtr cPtr = NDalicPINVOKE.Stage_DEFAULT_BACKGROUND_COLOR_get(); - Vector4 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector4(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - internal static Vector4 DEBUG_BACKGROUND_COLOR - { - get - { - global::System.IntPtr cPtr = NDalicPINVOKE.Stage_DEBUG_BACKGROUND_COLOR_get(); - Vector4 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector4(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - internal Stage() : this(NDalicPINVOKE.new_Stage__SWIG_0(), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal static Stage GetCurrent() - { - Stage ret = new Stage(NDalicPINVOKE.Stage_GetCurrent(), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal static bool IsInstalled() - { - bool ret = NDalicPINVOKE.Stage_IsInstalled(); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal Stage(Stage handle) : this(NDalicPINVOKE.new_Stage__SWIG_1(Stage.getCPtr(handle)), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal Stage Assign(Stage rhs) - { - Stage ret = new Stage(NDalicPINVOKE.Stage_Assign(swigCPtr, Stage.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal void Add(Actor actor) - { - NDalicPINVOKE.Stage_Add(swigCPtr, Actor.getCPtr(actor)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal void Remove(Actor actor) - { - NDalicPINVOKE.Stage_Remove(swigCPtr, Actor.getCPtr(actor)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal Size2D GetSize() - { - Size2D ret = new Size2D(NDalicPINVOKE.Stage_GetSize(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal RenderTaskList GetRenderTaskList() - { - RenderTaskList ret = new RenderTaskList(NDalicPINVOKE.Stage_GetRenderTaskList(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal uint GetLayerCount() - { - uint ret = NDalicPINVOKE.Stage_GetLayerCount(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - /// - /// Retrieves the layer at a specified depth. - /// - /// The depth - /// The layer found at the given depth - public Layer GetLayer(uint depth) - { - Layer ret = new Layer(NDalicPINVOKE.Stage_GetLayer(swigCPtr, depth), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal Layer GetRootLayer() - { - Layer ret = new Layer(NDalicPINVOKE.Stage_GetRootLayer(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal void SetBackgroundColor(Color color) - { - NDalicPINVOKE.Stage_SetBackgroundColor(swigCPtr, Color.getCPtr(color)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal Color GetBackgroundColor() - { - Color ret = new Color(NDalicPINVOKE.Stage_GetBackgroundColor(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal Vector2 GetDpi() - { - Vector2 ret = new Vector2(NDalicPINVOKE.Stage_GetDpi(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal ObjectRegistry GetObjectRegistry() - { - ObjectRegistry ret = new ObjectRegistry(NDalicPINVOKE.Stage_GetObjectRegistry(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - /// - /// Keep rendering for at least the given amount of time. - /// - /// Time to keep rendering, 0 means render at least one more frame - public void KeepRendering(float durationSeconds) - { - NDalicPINVOKE.Stage_KeepRendering(swigCPtr, durationSeconds); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal KeyEventSignal KeyEventSignal() - { - KeyEventSignal ret = new KeyEventSignal(NDalicPINVOKE.Stage_KeyEventSignal(swigCPtr), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal VoidSignal EventProcessingFinishedSignal() - { - VoidSignal ret = new VoidSignal(NDalicPINVOKE.Stage_EventProcessingFinishedSignal(swigCPtr), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal TouchSignal TouchSignal() - { - TouchSignal ret = new TouchSignal(NDalicPINVOKE.Stage_TouchSignal(swigCPtr), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal StageWheelSignal WheelEventSignal() - { - StageWheelSignal ret = new StageWheelSignal(NDalicPINVOKE.Stage_WheelEventSignal(swigCPtr), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal VoidSignal ContextLostSignal() - { - VoidSignal ret = new VoidSignal(NDalicPINVOKE.Stage_ContextLostSignal(swigCPtr), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal VoidSignal ContextRegainedSignal() - { - VoidSignal ret = new VoidSignal(NDalicPINVOKE.Stage_ContextRegainedSignal(swigCPtr), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal VoidSignal SceneCreatedSignal() - { - VoidSignal ret = new VoidSignal(NDalicPINVOKE.Stage_SceneCreatedSignal(swigCPtr), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - } - -} diff --git a/src/Tizen.NUI/src/public/StyleManager.cs b/src/Tizen.NUI/src/public/StyleManager.cs index 3e291d0..06c2ff2 100755 --- a/src/Tizen.NUI/src/public/StyleManager.cs +++ b/src/Tizen.NUI/src/public/StyleManager.cs @@ -41,7 +41,7 @@ namespace Tizen.NUI /// public override void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; diff --git a/src/Tizen.NUI/src/public/TableView.cs b/src/Tizen.NUI/src/public/TableView.cs index 27237ef..21913cc 100755 --- a/src/Tizen.NUI/src/public/TableView.cs +++ b/src/Tizen.NUI/src/public/TableView.cs @@ -28,7 +28,7 @@ using Tizen.NUI.BaseComponents; namespace Tizen.NUI { - + using Tizen.NUI.BaseComponents; /// /// TableView is a layout container for aligning child actors in a grid like layout.
/// TableView constrains the x and y position and width and height of the child actors.
@@ -51,7 +51,7 @@ namespace Tizen.NUI public override void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; @@ -92,11 +92,16 @@ namespace Tizen.NUI ~Property() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock (this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) @@ -143,11 +148,16 @@ namespace Tizen.NUI ~ChildProperty() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock (this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) @@ -197,11 +207,16 @@ namespace Tizen.NUI ~CellPosition() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock (this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) @@ -394,9 +409,9 @@ namespace Tizen.NUI /// The child to add /// The position for the child /// Tue if the addition succeeded and false if the cell is already occupied - public bool AddChild(Actor child, TableView.CellPosition position) + public bool AddChild(View child, TableView.CellPosition position) { - bool ret = NDalicPINVOKE.TableView_AddChild(swigCPtr, Actor.getCPtr(child), TableView.CellPosition.getCPtr(position)); + bool ret = NDalicPINVOKE.TableView_AddChild(swigCPtr, View.getCPtr(child), TableView.CellPosition.getCPtr(position)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } @@ -406,9 +421,9 @@ namespace Tizen.NUI /// /// The position in the table /// Child that was in the cell or an uninitialized handle - public Actor GetChildAt(TableView.CellPosition position) + public View GetChildAt(TableView.CellPosition position) { - Actor ret = new Actor(NDalicPINVOKE.TableView_GetChildAt(swigCPtr, TableView.CellPosition.getCPtr(position)), true); + View ret = new View(NDalicPINVOKE.TableView_GetChildAt(swigCPtr, TableView.CellPosition.getCPtr(position)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } @@ -418,9 +433,9 @@ namespace Tizen.NUI /// /// The position for the child to remove /// Child that was removed or an uninitialized handle - public Actor RemoveChildAt(TableView.CellPosition position) + public View RemoveChildAt(TableView.CellPosition position) { - Actor ret = new Actor(NDalicPINVOKE.TableView_RemoveChildAt(swigCPtr, TableView.CellPosition.getCPtr(position)), true); + View ret = new View(NDalicPINVOKE.TableView_RemoveChildAt(swigCPtr, TableView.CellPosition.getCPtr(position)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } @@ -431,9 +446,9 @@ namespace Tizen.NUI /// The child to search for /// The position for the child /// true if the child was included in this TableView - public bool FindChildPosition(Actor child, TableView.CellPosition position) + public bool FindChildPosition(View child, TableView.CellPosition position) { - bool ret = NDalicPINVOKE.TableView_FindChildPosition(swigCPtr, Actor.getCPtr(child), TableView.CellPosition.getCPtr(position)); + bool ret = NDalicPINVOKE.TableView_FindChildPosition(swigCPtr, View.getCPtr(child), TableView.CellPosition.getCPtr(position)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } @@ -459,9 +474,9 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal void DeleteRow(uint rowIndex, ActorContainer removed) + internal void DeleteRow(uint rowIndex, ViewContainer removed) { - NDalicPINVOKE.TableView_DeleteRow__SWIG_1(swigCPtr, rowIndex, ActorContainer.getCPtr(removed)); + NDalicPINVOKE.TableView_DeleteRow__SWIG_1(swigCPtr, rowIndex, ViewContainer.getCPtr(removed)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -486,9 +501,9 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal void DeleteColumn(uint columnIndex, ActorContainer removed) + internal void DeleteColumn(uint columnIndex, ViewContainer removed) { - NDalicPINVOKE.TableView_DeleteColumn__SWIG_1(swigCPtr, columnIndex, ActorContainer.getCPtr(removed)); + NDalicPINVOKE.TableView_DeleteColumn__SWIG_1(swigCPtr, columnIndex, ViewContainer.getCPtr(removed)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -503,9 +518,9 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal void Resize(uint rows, uint columns, ActorContainer removed) + internal void Resize(uint rows, uint columns, ViewContainer removed) { - NDalicPINVOKE.TableView_Resize__SWIG_1(swigCPtr, rows, columns, ActorContainer.getCPtr(removed)); + NDalicPINVOKE.TableView_Resize__SWIG_1(swigCPtr, rows, columns, ViewContainer.getCPtr(removed)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/src/Tizen.NUI/src/public/TapGesture.cs b/src/Tizen.NUI/src/public/TapGesture.cs index f2e01e4..06db807 100755 --- a/src/Tizen.NUI/src/public/TapGesture.cs +++ b/src/Tizen.NUI/src/public/TapGesture.cs @@ -33,7 +33,7 @@ namespace Tizen.NUI /// public override void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; diff --git a/src/Tizen.NUI/src/public/Timer.cs b/src/Tizen.NUI/src/public/Timer.cs index edfafba..8e02c9d 100755 --- a/src/Tizen.NUI/src/public/Timer.cs +++ b/src/Tizen.NUI/src/public/Timer.cs @@ -56,7 +56,7 @@ namespace Tizen.NUI public override void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; diff --git a/src/Tizen.NUI/src/public/Touch.cs b/src/Tizen.NUI/src/public/Touch.cs index 2e07747..b461d13 100755 --- a/src/Tizen.NUI/src/public/Touch.cs +++ b/src/Tizen.NUI/src/public/Touch.cs @@ -10,6 +10,7 @@ namespace Tizen.NUI { + using Tizen.NUI.BaseComponents; /// /// Touch events are a collection of points at a specific moment in time.
/// When a multi-touch event occurs, each point represents the points that are currently being @@ -31,7 +32,7 @@ namespace Tizen.NUI public override void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; @@ -138,9 +139,9 @@ namespace Tizen.NUI /// /// The point required /// The actor that was underneath the point specified - public Actor GetHitActor(uint point) + public View GetHitView(uint point) { - Actor ret = new Actor(NDalicPINVOKE.Touch_GetHitActor(swigCPtr, point), true); + View ret = new View(NDalicPINVOKE.Touch_GetHitActor(swigCPtr, point), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } diff --git a/src/Tizen.NUI/src/public/UIComponents/CheckBoxButton.cs b/src/Tizen.NUI/src/public/UIComponents/CheckBoxButton.cs index 52da08c..3fdf472 100755 --- a/src/Tizen.NUI/src/public/UIComponents/CheckBoxButton.cs +++ b/src/Tizen.NUI/src/public/UIComponents/CheckBoxButton.cs @@ -47,7 +47,7 @@ namespace Tizen.NUI.UIComponents /// public override void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; diff --git a/src/Tizen.NUI/src/public/UIComponents/PushButton.cs b/src/Tizen.NUI/src/public/UIComponents/PushButton.cs index b4d1de8..64cb7f4 100755 --- a/src/Tizen.NUI/src/public/UIComponents/PushButton.cs +++ b/src/Tizen.NUI/src/public/UIComponents/PushButton.cs @@ -46,12 +46,12 @@ namespace Tizen.NUI.UIComponents return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; } - /// + /// /// To make PushButton instance be disposed. /// public override void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; @@ -92,11 +92,16 @@ namespace Tizen.NUI.UIComponents ~Property() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock (this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) @@ -165,15 +170,15 @@ namespace Tizen.NUI.UIComponents if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal void SetButtonImage(Actor image) + internal void SetButtonImage(View image) { - NDalicPINVOKE.PushButton_SetButtonImage__SWIG_1(swigCPtr, Actor.getCPtr(image)); + NDalicPINVOKE.PushButton_SetButtonImage__SWIG_1(swigCPtr, View.getCPtr(image)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal void SetBackgroundImage(Actor image) + internal void SetBackgroundImage(View image) { - NDalicPINVOKE.PushButton_SetBackgroundImage(swigCPtr, Actor.getCPtr(image)); + NDalicPINVOKE.PushButton_SetBackgroundImage(swigCPtr, View.getCPtr(image)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -183,33 +188,33 @@ namespace Tizen.NUI.UIComponents if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal void SetSelectedImage(Actor image) + internal void SetSelectedImage(View image) { - NDalicPINVOKE.PushButton_SetSelectedImage__SWIG_1(swigCPtr, Actor.getCPtr(image)); + NDalicPINVOKE.PushButton_SetSelectedImage__SWIG_1(swigCPtr, View.getCPtr(image)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal void SetSelectedBackgroundImage(Actor image) + internal void SetSelectedBackgroundImage(View image) { - NDalicPINVOKE.PushButton_SetSelectedBackgroundImage(swigCPtr, Actor.getCPtr(image)); + NDalicPINVOKE.PushButton_SetSelectedBackgroundImage(swigCPtr, View.getCPtr(image)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal void SetDisabledBackgroundImage(Actor image) + internal void SetDisabledBackgroundImage(View image) { - NDalicPINVOKE.PushButton_SetDisabledBackgroundImage(swigCPtr, Actor.getCPtr(image)); + NDalicPINVOKE.PushButton_SetDisabledBackgroundImage(swigCPtr, View.getCPtr(image)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal void SetDisabledImage(Actor image) + internal void SetDisabledImage(View image) { - NDalicPINVOKE.PushButton_SetDisabledImage(swigCPtr, Actor.getCPtr(image)); + NDalicPINVOKE.PushButton_SetDisabledImage(swigCPtr, View.getCPtr(image)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal void SetDisabledSelectedImage(Actor image) + internal void SetDisabledSelectedImage(View image) { - NDalicPINVOKE.PushButton_SetDisabledSelectedImage(swigCPtr, Actor.getCPtr(image)); + NDalicPINVOKE.PushButton_SetDisabledSelectedImage(swigCPtr, View.getCPtr(image)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/src/Tizen.NUI/src/public/UIComponents/ScrollBar.cs b/src/Tizen.NUI/src/public/UIComponents/ScrollBar.cs index 2254c43..3fe33e5 100755 --- a/src/Tizen.NUI/src/public/UIComponents/ScrollBar.cs +++ b/src/Tizen.NUI/src/public/UIComponents/ScrollBar.cs @@ -54,7 +54,7 @@ namespace Tizen.NUI.UIComponents /// public override void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; @@ -208,11 +208,16 @@ namespace Tizen.NUI.UIComponents ~Property() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock (this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) @@ -288,21 +293,21 @@ namespace Tizen.NUI.UIComponents return ret; } - internal void SetScrollPropertySource(Handle handle, int propertyScrollPosition, int propertyMinScrollPosition, int propertyMaxScrollPosition, int propertyScrollContentSize) + internal void SetScrollPropertySource(Animatable handle, int propertyScrollPosition, int propertyMinScrollPosition, int propertyMaxScrollPosition, int propertyScrollContentSize) { - NDalicPINVOKE.ScrollBar_SetScrollPropertySource(swigCPtr, Handle.getCPtr(handle), propertyScrollPosition, propertyMinScrollPosition, propertyMaxScrollPosition, propertyScrollContentSize); + NDalicPINVOKE.ScrollBar_SetScrollPropertySource(swigCPtr, Animatable.getCPtr(handle), propertyScrollPosition, propertyMinScrollPosition, propertyMaxScrollPosition, propertyScrollContentSize); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal void SetScrollIndicator(Actor indicator) + internal void SetScrollIndicator(View indicator) { - NDalicPINVOKE.ScrollBar_SetScrollIndicator(swigCPtr, Actor.getCPtr(indicator)); + NDalicPINVOKE.ScrollBar_SetScrollIndicator(swigCPtr, View.getCPtr(indicator)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal Actor GetScrollIndicator() + internal View GetScrollIndicator() { - Actor ret = new Actor(NDalicPINVOKE.ScrollBar_GetScrollIndicator(swigCPtr), true); + View ret = new View(NDalicPINVOKE.ScrollBar_GetScrollIndicator(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } diff --git a/src/Tizen.NUI/src/public/Vector2.cs b/src/Tizen.NUI/src/public/Vector2.cs index 27d0fc4..eb78892 100755 --- a/src/Tizen.NUI/src/public/Vector2.cs +++ b/src/Tizen.NUI/src/public/Vector2.cs @@ -37,7 +37,7 @@ namespace Tizen.NUI public virtual void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; diff --git a/src/Tizen.NUI/src/public/Vector3.cs b/src/Tizen.NUI/src/public/Vector3.cs index 1bc3de0..6c6bfe2 100755 --- a/src/Tizen.NUI/src/public/Vector3.cs +++ b/src/Tizen.NUI/src/public/Vector3.cs @@ -37,7 +37,7 @@ namespace Tizen.NUI public virtual void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; diff --git a/src/Tizen.NUI/src/public/Vector4.cs b/src/Tizen.NUI/src/public/Vector4.cs index 627e5bd..1967f2e 100755 --- a/src/Tizen.NUI/src/public/Vector4.cs +++ b/src/Tizen.NUI/src/public/Vector4.cs @@ -37,7 +37,7 @@ namespace Tizen.NUI public virtual void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; diff --git a/src/Tizen.NUI/src/public/VideoView.cs b/src/Tizen.NUI/src/public/VideoView.cs index ba3a405..39d85ab 100755 --- a/src/Tizen.NUI/src/public/VideoView.cs +++ b/src/Tizen.NUI/src/public/VideoView.cs @@ -50,7 +50,7 @@ namespace Tizen.NUI public override void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; @@ -169,11 +169,16 @@ namespace Tizen.NUI ~Property() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + lock (this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) diff --git a/src/Tizen.NUI/src/public/VisualBase.cs b/src/Tizen.NUI/src/public/VisualBase.cs index 137e4d2..c9723d5 100755 --- a/src/Tizen.NUI/src/public/VisualBase.cs +++ b/src/Tizen.NUI/src/public/VisualBase.cs @@ -13,7 +13,7 @@ namespace Tizen.NUI /// /// Sets whether the actor should be focusable by keyboard navigation.
- /// Visuals reuse geometry, shader etc. across controls. They ensure that the renderer and texture sets exist only when control is on-stage.
+ /// Visuals reuse geometry, shader etc. across controls. They ensure that the renderer and texture sets exist only when control is on-window.
/// Each visual also responds to actor size and color change, and provides clipping at the renderer level.
/// public class VisualBase : BaseHandle @@ -32,7 +32,7 @@ namespace Tizen.NUI public override void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; @@ -139,7 +139,7 @@ namespace Tizen.NUI /// /// Return the natural size of the visual.
/// Deriving classes stipulate the natural size and by default a visual has a ZERO natural size.
- /// A visual may not actually have a natural size until it has been placed on stage and acquired all it's resources.
+ /// A visual may not actually have a natural size until it has been placed on window and acquired all it's resources.
/// /// The visual's natural size public void GetNaturalSize(Size2D naturalSize) diff --git a/src/Tizen.NUI/src/public/VisualFactory.cs b/src/Tizen.NUI/src/public/VisualFactory.cs index 23d04f5..8f5c4ed 100755 --- a/src/Tizen.NUI/src/public/VisualFactory.cs +++ b/src/Tizen.NUI/src/public/VisualFactory.cs @@ -30,7 +30,7 @@ namespace Tizen.NUI public override void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; diff --git a/src/Tizen.NUI/src/public/Wheel.cs b/src/Tizen.NUI/src/public/Wheel.cs index 7378912..fa38d47 100755 --- a/src/Tizen.NUI/src/public/Wheel.cs +++ b/src/Tizen.NUI/src/public/Wheel.cs @@ -15,7 +15,7 @@ namespace Tizen.NUI /// The wheel event structure is used to store a wheel rolling, it facilitates processing of the wheel rolling and passing to other libraries like Toolkit.
/// There is a key modifier which relates to keys like alt, shift and control functions are supplied to check if they have been pressed when the wheel is being rolled.
/// We support a mouse device and there may be another custom device that support the wheel event. The device type is specified as \e type.
- /// The mouse wheel event can be sent to the specific actor but the custom wheel event will be sent to the stage.
+ /// The mouse wheel event can be sent to the specific actor but the custom wheel event will be sent to the window.
/// public class Wheel : global::System.IDisposable { @@ -40,7 +40,7 @@ namespace Tizen.NUI public virtual void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; diff --git a/src/Tizen.NUI/src/public/Window.cs b/src/Tizen.NUI/src/public/Window.cs index bd0e837..4a04312 100755 --- a/src/Tizen.NUI/src/public/Window.cs +++ b/src/Tizen.NUI/src/public/Window.cs @@ -29,7 +29,7 @@ namespace Tizen.NUI using System; using System.Runtime.InteropServices; - + using Tizen.NUI.BaseComponents; /// /// The window class is used internally for drawing.
@@ -38,10 +38,12 @@ namespace Tizen.NUI public class Window : BaseHandle { private global::System.Runtime.InteropServices.HandleRef swigCPtr; + private global::System.Runtime.InteropServices.HandleRef stageCPtr; 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()); } internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Window obj) @@ -54,7 +56,7 @@ namespace Tizen.NUI /// public override void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; @@ -68,6 +70,7 @@ namespace Tizen.NUI { swigCMemOwn = false; NDalicPINVOKE.delete_Window(swigCPtr); + NDalicPINVOKE.delete_Stage(stageCPtr); } swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); } @@ -76,6 +79,20 @@ namespace Tizen.NUI } } + internal static Window GetCurrent() + { + Window ret = new Window(NDalicPINVOKE.Stage_GetCurrent(), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal static bool IsInstalled() + { + bool ret = NDalicPINVOKE.Stage_IsInstalled(); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + /// /// Sets the focus acceptable flag of an window as true. /// @@ -153,7 +170,7 @@ namespace Tizen.NUI { _windowFocusChangedEventHandler -= value; - if (_windowFocusChangedEventHandler == null && WindowFocusChangedSignal().Empty() == false) + if (_windowFocusChangedEventHandler == null && WindowFocusChangedSignal().Empty() == false && _windowFocusChangedEventCallback != null) { WindowFocusChangedSignal().Disconnect(_windowFocusChangedEventCallback); } @@ -172,7 +189,7 @@ namespace Tizen.NUI } } - public WindowFocusSignalType WindowFocusChangedSignal() + internal WindowFocusSignalType WindowFocusChangedSignal() { WindowFocusSignalType ret = new WindowFocusSignalType(NDalicPINVOKE.FocusChangedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -343,6 +360,211 @@ namespace Tizen.NUI return ret; } + internal WindowFocusSignalType FocusChangedSignal() + { + WindowFocusSignalType ret = new WindowFocusSignalType(NDalicPINVOKE.FocusChangedSignal(swigCPtr), false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + /// + /// Get default ( root ) layer. + /// + /// The root layer + public Layer GetDefaultLayer() + { + return this.GetRootLayer(); + } + + /// + /// Add layer to the Stage. + /// + /// Layer to add + public void AddLayer(Layer layer) + { + NDalicPINVOKE.Stage_Add(stageCPtr, Layer.getCPtr(layer)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + /// + /// Remove layer from the Stage. + /// + /// Layer to remove + public void RemoveLayer(Layer layer) + { + NDalicPINVOKE.Stage_Remove(stageCPtr, Layer.getCPtr(layer)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal void Add(View view) + { + NDalicPINVOKE.Stage_Add(stageCPtr, View.getCPtr(view)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal void Remove(View view) + { + NDalicPINVOKE.Stage_Remove(stageCPtr, View.getCPtr(view)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal Vector2 GetSize() + { + Vector2 ret = new Vector2(NDalicPINVOKE.Stage_GetSize(stageCPtr), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal RenderTaskList GetRenderTaskList() + { + RenderTaskList ret = new RenderTaskList(NDalicPINVOKE.Stage_GetRenderTaskList(stageCPtr), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal uint GetLayerCount() + { + uint ret = NDalicPINVOKE.Stage_GetLayerCount(stageCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public Layer GetLayer(uint depth) + { + Layer ret = new Layer(NDalicPINVOKE.Stage_GetLayer(stageCPtr, depth), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal Layer GetRootLayer() + { + Layer ret = new Layer(NDalicPINVOKE.Stage_GetRootLayer(stageCPtr), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal void SetBackgroundColor(Vector4 color) + { + NDalicPINVOKE.Stage_SetBackgroundColor(stageCPtr, Vector4.getCPtr(color)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal Vector4 GetBackgroundColor() + { + Vector4 ret = new Vector4(NDalicPINVOKE.Stage_GetBackgroundColor(stageCPtr), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal Vector2 GetDpi() + { + Vector2 ret = new Vector2(NDalicPINVOKE.Stage_GetDpi(stageCPtr), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal ObjectRegistry GetObjectRegistry() + { + ObjectRegistry ret = new ObjectRegistry(NDalicPINVOKE.Stage_GetObjectRegistry(stageCPtr), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + /// + /// Keep rendering for at least the given amount of time. + /// + /// Time to keep rendering, 0 means render at least one more frame + public void KeepRendering(float durationSeconds) + { + NDalicPINVOKE.Stage_KeepRendering(stageCPtr, durationSeconds); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal KeyEventSignal KeyEventSignal() + { + KeyEventSignal ret = new KeyEventSignal(NDalicPINVOKE.Stage_KeyEventSignal(stageCPtr), false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal VoidSignal EventProcessingFinishedSignal() + { + VoidSignal ret = new VoidSignal(NDalicPINVOKE.Stage_EventProcessingFinishedSignal(stageCPtr), false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal TouchSignal TouchSignal() + { + TouchSignal ret = new TouchSignal(NDalicPINVOKE.Stage_TouchSignal(stageCPtr), false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + private StageWheelSignal WheelEventSignal() + { + StageWheelSignal ret = new StageWheelSignal(NDalicPINVOKE.Stage_WheelEventSignal(stageCPtr), false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal VoidSignal ContextLostSignal() + { + VoidSignal ret = new VoidSignal(NDalicPINVOKE.Stage_ContextLostSignal(stageCPtr), false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal VoidSignal ContextRegainedSignal() + { + VoidSignal ret = new VoidSignal(NDalicPINVOKE.Stage_ContextRegainedSignal(stageCPtr), false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal VoidSignal SceneCreatedSignal() + { + VoidSignal ret = new VoidSignal(NDalicPINVOKE.Stage_SceneCreatedSignal(stageCPtr), false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal static Vector4 DEFAULT_BACKGROUND_COLOR + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.Stage_DEFAULT_BACKGROUND_COLOR_get(); + Vector4 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector4(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + internal static Vector4 DEBUG_BACKGROUND_COLOR + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.Stage_DEBUG_BACKGROUND_COLOR_get(); + Vector4 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector4(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + private static readonly Window instance = Application.Instance.GetWindow(); + + /// + /// Stage instance property (read-only).
+ /// Gets the current Window.
+ /// + public static Window Instance + { + get + { + return instance; + } + } + /// /// Grabs the key specified by a key for a window only when a window is the topmost window.
/// This function can be used for following example scenarios:
@@ -459,5 +681,397 @@ namespace Tizen.NUI Visible = 1, Auto = 2 } + + /// + /// Touch event argument. + /// + public class TouchEventArgs : EventArgs + { + private Touch _touch; + + /// + /// Touch. + /// + public Touch Touch + { + get + { + return _touch; + } + set + { + _touch = value; + } + } + } + + private event EventHandler _stageTouchHandler; + private EventCallbackDelegateType1 _stageTouchCallbackDelegate; + + /// + /// This is emitted when the screen is touched and when the touch ends.
+ /// If there are multiple touch points, then this will be emitted when the first touch occurs and + /// then when the last finger is lifted.
+ /// An interrupted event will also be emitted (if it occurs).
+ /// + public event EventHandler TouchEvent + { + add + { + lock (this) + { + _stageTouchHandler += value; + _stageTouchCallbackDelegate = OnStageTouch; + this.TouchSignal().Connect(_stageTouchCallbackDelegate); + } + } + remove + { + lock (this) + { + if (_stageTouchHandler != null) + { + this.TouchSignal().Disconnect(_stageTouchCallbackDelegate); + } + _stageTouchHandler -= value; + } + } + } + + private void OnStageTouch(IntPtr data) + { + TouchEventArgs e = new TouchEventArgs(); + + if (data != null) + { + e.Touch = Tizen.NUI.Touch.GetTouchFromPtr(data); + } + + if (_stageTouchHandler != null) + { + _stageTouchHandler(this, e); + } + } + + /// + /// Wheel event arguments. + /// + public class WheelEventArgs : EventArgs + { + private Wheel _wheel; + + /// + /// Wheel. + /// + public Wheel Wheel + { + get + { + return _wheel; + } + set + { + _wheel = value; + } + } + } + + private event EventHandler _stageWheelHandler; + private EventCallbackDelegateType1 _stageWheelCallbackDelegate; + + /// + /// Event emitted when wheel event is received. + /// + public event EventHandler WheelEvent + { + add + { + if (_stageWheelHandler == null) + { + _stageWheelCallbackDelegate = OnStageWheel; + WheelEventSignal().Connect(_stageWheelCallbackDelegate); + } + _stageWheelHandler += value; + } + remove + { + _stageWheelHandler -= value; + if (_stageWheelHandler == null && WheelEventSignal().Empty() == false) + { + WheelEventSignal().Disconnect(_stageWheelCallbackDelegate); + } + } + } + + private void OnStageWheel(IntPtr data) + { + WheelEventArgs e = new WheelEventArgs(); + + if (data != null) + { + e.Wheel = Tizen.NUI.Wheel.GetWheelFromPtr(data); + } + + if (_stageWheelHandler != null) + { + _stageWheelHandler(this, e); + } + } + + /// + /// Key event arguments. + /// + public class KeyEventArgs : EventArgs + { + private Key _key; + + /// + /// Key + /// + public Key Key + { + get + { + return _key; + } + set + { + _key = value; + } + } + } + + private event EventHandler _stageKeyHandler; + private EventCallbackDelegateType1 _stageKeyCallbackDelegate; + + /// + /// Event emitted when key event is received. + /// + public event EventHandler KeyEvent + { + add + { + if (_stageKeyHandler == null) + { + _stageKeyCallbackDelegate = OnStageKey; + KeyEventSignal().Connect(_stageKeyCallbackDelegate); + } + _stageKeyHandler += value; + } + remove + { + _stageKeyHandler -= value; + if (_stageKeyHandler == null && KeyEventSignal().Empty() == false) + { + KeyEventSignal().Disconnect(_stageKeyCallbackDelegate); + } + } + } + + // Callback for Stage KeyEventsignal + private void OnStageKey(IntPtr data) + { + KeyEventArgs e = new KeyEventArgs(); + + if (data != null) + { + e.Key = Tizen.NUI.Key.GetKeyFromPtr(data); + } + + if (_stageKeyHandler != null) + { + //here we send all data to user event handlers + _stageKeyHandler(this, e); + } + } + + + private event EventHandler _stageEventProcessingFinishedEventHandler; + private EventCallbackDelegateType0 _stageEventProcessingFinishedEventCallbackDelegate; + + internal event EventHandler EventProcessingFinished + { + add + { + if (_stageEventProcessingFinishedEventHandler == null) + { + _stageEventProcessingFinishedEventCallbackDelegate = OnEventProcessingFinished; + EventProcessingFinishedSignal().Connect(_stageEventProcessingFinishedEventCallbackDelegate); + } + _stageEventProcessingFinishedEventHandler += value; + + } + remove + { + _stageEventProcessingFinishedEventHandler -= value; + if (_stageEventProcessingFinishedEventHandler == null && EventProcessingFinishedSignal().Empty() == false) + { + EventProcessingFinishedSignal().Disconnect(_stageEventProcessingFinishedEventCallbackDelegate); + } + } + } + + // Callback for Stage EventProcessingFinishedSignal + private void OnEventProcessingFinished() + { + if (_stageEventProcessingFinishedEventHandler != null) + { + _stageEventProcessingFinishedEventHandler(this, null); + } + } + + + private EventHandler _stageContextLostEventHandler; + private EventCallbackDelegateType0 _stageContextLostEventCallbackDelegate; + + internal event EventHandler ContextLost + { + add + { + if (_stageContextLostEventHandler == null) + { + _stageContextLostEventCallbackDelegate = OnContextLost; + ContextLostSignal().Connect(_stageContextLostEventCallbackDelegate); + } + _stageContextLostEventHandler += value; + } + remove + { + _stageContextLostEventHandler -= value; + if (_stageContextLostEventHandler == null && ContextLostSignal().Empty() == false) + { + ContextLostSignal().Disconnect(_stageContextLostEventCallbackDelegate); + } + } + } + + // Callback for Stage ContextLostSignal + private void OnContextLost() + { + if (_stageContextLostEventHandler != null) + { + _stageContextLostEventHandler(this, null); + } + } + + + private EventHandler _stageContextRegainedEventHandler; + private EventCallbackDelegateType0 _stageContextRegainedEventCallbackDelegate; + + internal event EventHandler ContextRegained + { + add + { + if (_stageContextRegainedEventHandler == null) + { + _stageContextRegainedEventCallbackDelegate = OnContextRegained; + ContextRegainedSignal().Connect(_stageContextRegainedEventCallbackDelegate); + } + _stageContextRegainedEventHandler += value; + } + remove + { + _stageContextRegainedEventHandler -= value; + if (_stageContextRegainedEventHandler == null && ContextRegainedSignal().Empty() == false) + { + this.ContextRegainedSignal().Disconnect(_stageContextRegainedEventCallbackDelegate); + } + } + } + + // Callback for Stage ContextRegainedSignal + private void OnContextRegained() + { + if (_stageContextRegainedEventHandler != null) + { + _stageContextRegainedEventHandler(this, null); + } + } + + + private EventHandler _stageSceneCreatedEventHandler; + private EventCallbackDelegateType0 _stageSceneCreatedEventCallbackDelegate; + + internal event EventHandler SceneCreated + { + add + { + if (_stageSceneCreatedEventHandler == null) + { + _stageSceneCreatedEventCallbackDelegate = OnSceneCreated; + SceneCreatedSignal().Connect(_stageSceneCreatedEventCallbackDelegate); + } + _stageSceneCreatedEventHandler += value; + } + remove + { + _stageSceneCreatedEventHandler -= value; + if (_stageSceneCreatedEventHandler == null && SceneCreatedSignal().Empty() == false) + { + SceneCreatedSignal().Disconnect(_stageSceneCreatedEventCallbackDelegate); + } + } + } + + // Callback for Stage SceneCreatedSignal + private void OnSceneCreated() + { + if (_stageSceneCreatedEventHandler != null) + { + _stageSceneCreatedEventHandler(this, null); + } + } + + /// + /// Window size property (read-only). + /// + public Vector2 Size + { + get + { + Vector2 ret = GetSize(); + return ret; + } + } + + /// + /// Background color property. + /// + public Vector4 BackgroundColor + { + set + { + SetBackgroundColor(value); + } + get + { + Vector4 ret = GetBackgroundColor(); + return ret; + } + } + + /// + /// Dpi property (read-only).
+ /// Retrieves the DPI of the display device to which the Window is connected.
+ /// + public Vector2 Dpi + { + get + { + return GetDpi(); + } + } + + /// + /// Layer count property (read-only).
+ /// Queries the number of on-Window layers.
+ /// + public uint LayerCount + { + get + { + return GetLayerCount(); + } + } } }