From de507fd85c421b782251f5532a169dd6dfef0c75 Mon Sep 17 00:00:00 2001 From: "dongsug.song" Date: Wed, 31 May 2017 21:16:30 +0900 Subject: [PATCH] [Tizen] Revert "merging dali-sharp class scope with nui" This reverts commit 4488e48a25676636e85ec7d6aa628755f55e1a85. Change-Id: I3e731ea840b46e15371ae84ed772f5c80f05b13e --- src/Tizen.NUI/src/internal/AlignType.cs | 27 ++ .../src/{public => internal}/Animatable.cs | 6 + .../src/{public => internal}/BaseHandle.cs | 0 src/Tizen.NUI/src/internal/Builder.cs | 2 +- .../{public/UIComponents => internal}/Button.cs | 0 src/Tizen.NUI/src/internal/Camera.cs | 2 +- src/Tizen.NUI/src/internal/ClampState.cs | 21 + src/Tizen.NUI/src/internal/ClampState2D.cs | 139 +++++++ .../src/internal/ConnectionTrackerInterface.cs | 2 +- .../src/internal/ControlOrientationType.cs | 22 ++ src/Tizen.NUI/src/internal/CustomActor.cs | 2 +- src/Tizen.NUI/src/internal/CustomActorImpl.cs | 2 +- .../src/internal/DefaultItemLayoutProperty.cs | 2 +- .../src/internal/DefaultItemLayoutType.cs | 2 +- src/Tizen.NUI/src/internal/DefaultRuler.cs | 2 +- .../src/{public => internal}/DirectionBias.cs | 0 src/Tizen.NUI/src/internal/EventThreadCallback.cs | 2 +- src/Tizen.NUI/src/internal/FixedRuler.cs | 2 +- src/Tizen.NUI/src/internal/GestureDetector.cs | 2 +- src/Tizen.NUI/src/internal/Item.cs | 2 +- src/Tizen.NUI/src/internal/ItemContainer.cs | 2 +- src/Tizen.NUI/src/internal/ItemFactory.cs | 2 +- src/Tizen.NUI/src/internal/ItemIdContainer.cs | 2 +- src/Tizen.NUI/src/internal/ItemLayout.cs | 14 +- src/Tizen.NUI/src/internal/ItemRange.cs | 2 +- src/Tizen.NUI/src/internal/ItemView.cs | 2 +- .../{public => internal}/KeyInputFocusManager.cs | 0 ...geSignal.cs => KeyboardPreFocusChangeSignal.cs} | 2 +- .../src/internal/LongPressGestureDetector.cs | 2 +- src/Tizen.NUI/src/internal/Meta.cs | 19 + src/Tizen.NUI/src/internal/NDalic.cs | 20 + src/Tizen.NUI/src/internal/NDalicPINVOKE.cs | 3 - src/Tizen.NUI/src/internal/Object.cs | 2 +- .../src/{public => internal}/PaddingType.cs | 0 src/Tizen.NUI/src/internal/PanGestureDetector.cs | 2 +- src/Tizen.NUI/src/internal/PinchGestureDetector.cs | 2 +- .../src/{public/UIComponents => internal}/Popup.cs | 0 .../src/internal/PositionInheritanceMode.cs | 22 ++ .../src/{public => internal}/ProgressBar.cs | 0 .../src/internal/ProgressBarValueChangedSignal.cs | 2 +- .../UIComponents => internal}/RadioButton.cs | 0 src/Tizen.NUI/src/internal/RefObject.cs | 2 +- src/Tizen.NUI/src/internal/Ruler.cs | 2 +- src/Tizen.NUI/src/internal/RulerDomain.cs | 2 +- src/Tizen.NUI/src/internal/RulerPtr.cs | 2 +- .../src/internal/SWIGTYPE_p_CallbackBase.cs | 2 +- .../src/internal/SWIGTYPE_p_Dali__CallbackBase.cs | 2 +- .../internal/SWIGTYPE_p_Dali__FunctorDelegate.cs | 2 +- .../internal/SWIGTYPE_p_Dali__Internal__Texture.cs | 2 +- ...i__IntrusivePtrT_Dali__Toolkit__ItemLayout_t.cs | 2 +- ..._Dali__DevelActor__VisibilityChange__TypeF_t.cs | 2 +- .../UIComponents => internal}/ScrollView.cs | 74 +++- .../src/{public => internal}/ScrollViewEffect.cs | 0 .../src/{public => internal}/Scrollable.cs | 0 src/Tizen.NUI/src/internal/SignalObserver.cs | 2 +- src/Tizen.NUI/src/{public => internal}/Size.cs | 0 src/Tizen.NUI/src/internal/Slider.cs | 2 +- src/Tizen.NUI/src/internal/SlotObserver.cs | 2 +- src/Tizen.NUI/src/internal/TapGestureDetector.cs | 2 +- .../UIComponents => internal}/ToggleButton.cs | 0 .../src/{public => internal}/TransitionData.cs | 0 src/Tizen.NUI/src/internal/TypeInfo.cs | 6 + src/Tizen.NUI/src/internal/VectorFloat.cs | 216 +++++++++++ src/Tizen.NUI/src/internal/VectorInteger.cs | 218 +++++++++++ src/Tizen.NUI/src/internal/ViewContainer.cs | 422 +++++++++++++++++++++ src/Tizen.NUI/src/internal/ViewImpl.cs | 2 +- .../src/internal/ViewResourceReadySignal.cs | 2 +- src/Tizen.NUI/src/internal/ViewSignal.cs | 2 +- .../src/internal/ViewVisibilityChangedSignal.cs | 2 +- src/Tizen.NUI/src/internal/ViewWrapper.cs | 6 +- src/Tizen.NUI/src/internal/ViewWrapperImpl.cs | 4 +- .../VisibilityChangeType.cs | 0 src/Tizen.NUI/src/internal/VoidSignal.cs | 2 +- .../src/internal/WindowFocusSignalType.cs | 2 +- src/Tizen.NUI/src/public/BaseComponents/View.cs | 8 + src/Tizen.NUI/src/public/NUIConstants.cs | 10 - src/Tizen.NUI/src/public/TableView.cs | 18 + src/Tizen.NUI/src/public/UIComponents/ScrollBar.cs | 13 + 78 files changed, 1296 insertions(+), 78 deletions(-) create mode 100644 src/Tizen.NUI/src/internal/AlignType.cs rename src/Tizen.NUI/src/{public => internal}/Animatable.cs (96%) rename src/Tizen.NUI/src/{public => internal}/BaseHandle.cs (100%) rename src/Tizen.NUI/src/{public/UIComponents => internal}/Button.cs (100%) create mode 100755 src/Tizen.NUI/src/internal/ClampState.cs create mode 100755 src/Tizen.NUI/src/internal/ClampState2D.cs create mode 100755 src/Tizen.NUI/src/internal/ControlOrientationType.cs rename src/Tizen.NUI/src/{public => internal}/DirectionBias.cs (100%) rename src/Tizen.NUI/src/{public => internal}/KeyInputFocusManager.cs (100%) rename src/Tizen.NUI/src/internal/{PreFocusChangeSignal.cs => KeyboardPreFocusChangeSignal.cs} (99%) create mode 100755 src/Tizen.NUI/src/internal/Meta.cs rename src/Tizen.NUI/src/{public => internal}/PaddingType.cs (100%) rename src/Tizen.NUI/src/{public/UIComponents => internal}/Popup.cs (100%) create mode 100755 src/Tizen.NUI/src/internal/PositionInheritanceMode.cs rename src/Tizen.NUI/src/{public => internal}/ProgressBar.cs (100%) rename src/Tizen.NUI/src/{public/UIComponents => internal}/RadioButton.cs (100%) rename src/Tizen.NUI/src/{public/UIComponents => internal}/ScrollView.cs (94%) rename src/Tizen.NUI/src/{public => internal}/ScrollViewEffect.cs (100%) rename src/Tizen.NUI/src/{public => internal}/Scrollable.cs (100%) rename src/Tizen.NUI/src/{public => internal}/Size.cs (100%) rename src/Tizen.NUI/src/{public/UIComponents => internal}/ToggleButton.cs (100%) rename src/Tizen.NUI/src/{public => internal}/TransitionData.cs (100%) create mode 100755 src/Tizen.NUI/src/internal/VectorFloat.cs create mode 100755 src/Tizen.NUI/src/internal/VectorInteger.cs create mode 100755 src/Tizen.NUI/src/internal/ViewContainer.cs rename src/Tizen.NUI/src/{public/BaseComponents => internal}/VisibilityChangeType.cs (100%) diff --git a/src/Tizen.NUI/src/internal/AlignType.cs b/src/Tizen.NUI/src/internal/AlignType.cs new file mode 100644 index 0000000..c1537eb --- /dev/null +++ b/src/Tizen.NUI/src/internal/AlignType.cs @@ -0,0 +1,27 @@ +//------------------------------------------------------------------------------ +// +// +// 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 AlignType + { + TOP_BEGIN = 0, + TOP_CENTER, + TOP_END, + CENTER_BEGIN, + CENTER, + CENTER_END, + BOTTOM_BEGIN, + BOTTOM_CENTER, + BOTTOM_END + } +} +*/ \ No newline at end of file diff --git a/src/Tizen.NUI/src/public/Animatable.cs b/src/Tizen.NUI/src/internal/Animatable.cs similarity index 96% rename from src/Tizen.NUI/src/public/Animatable.cs rename to src/Tizen.NUI/src/internal/Animatable.cs index d02e57d..7e5ee28 100755 --- a/src/Tizen.NUI/src/public/Animatable.cs +++ b/src/Tizen.NUI/src/internal/Animatable.cs @@ -155,6 +155,12 @@ namespace Tizen.NUI return ret; } + 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); diff --git a/src/Tizen.NUI/src/public/BaseHandle.cs b/src/Tizen.NUI/src/internal/BaseHandle.cs similarity index 100% rename from src/Tizen.NUI/src/public/BaseHandle.cs rename to src/Tizen.NUI/src/internal/BaseHandle.cs diff --git a/src/Tizen.NUI/src/internal/Builder.cs b/src/Tizen.NUI/src/internal/Builder.cs index 0001b89..6e5a521 100755 --- a/src/Tizen.NUI/src/internal/Builder.cs +++ b/src/Tizen.NUI/src/internal/Builder.cs @@ -32,7 +32,7 @@ namespace Tizen.NUI using Tizen.NUI.BaseComponents; - internal class Builder : BaseHandle + public class Builder : BaseHandle { private global::System.Runtime.InteropServices.HandleRef swigCPtr; diff --git a/src/Tizen.NUI/src/public/UIComponents/Button.cs b/src/Tizen.NUI/src/internal/Button.cs similarity index 100% rename from src/Tizen.NUI/src/public/UIComponents/Button.cs rename to src/Tizen.NUI/src/internal/Button.cs diff --git a/src/Tizen.NUI/src/internal/Camera.cs b/src/Tizen.NUI/src/internal/Camera.cs index b7fe34d..26dbf69 100755 --- a/src/Tizen.NUI/src/internal/Camera.cs +++ b/src/Tizen.NUI/src/internal/Camera.cs @@ -27,7 +27,7 @@ namespace Tizen.NUI { - internal class Camera : Animatable + public class Camera : Animatable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; diff --git a/src/Tizen.NUI/src/internal/ClampState.cs b/src/Tizen.NUI/src/internal/ClampState.cs new file mode 100755 index 0000000..bcb760a --- /dev/null +++ b/src/Tizen.NUI/src/internal/ClampState.cs @@ -0,0 +1,21 @@ +//------------------------------------------------------------------------------ +// +// +// 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 +{ + + internal enum ClampState + { + NotClamped, + ClampedToMin, + ClampedToMax + } + +} diff --git a/src/Tizen.NUI/src/internal/ClampState2D.cs b/src/Tizen.NUI/src/internal/ClampState2D.cs new file mode 100755 index 0000000..1ebf1ba --- /dev/null +++ b/src/Tizen.NUI/src/internal/ClampState2D.cs @@ -0,0 +1,139 @@ +//------------------------------------------------------------------------------ +// +// +// 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 +{ + + internal class ClampState2D : global::System.IDisposable + { + private global::System.Runtime.InteropServices.HandleRef swigCPtr; + protected bool swigCMemOwn; + + internal ClampState2D(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(ClampState2D obj) + { + return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; + } + + //A Flag to check who called Dispose(). (By User or DisposeQueue) + private bool isDisposeQueued = false; + //A Flat to check if it is already disposed. + protected bool disposed = false; + + protected enum DisposeTypes + { + Explicit, //Called By User + Implicit, //Called by DisposeQueue + } + + ~ClampState2D() + { + if (!isDisposeQueued) + { + isDisposeQueued = true; + DisposeQueue.Instance.Add(this); + } + } + + public void Dispose() + { + //Throw excpetion if Dispose() is called in separate thread. + if (!Window.IsInstalled()) + { + throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread."); + } + + if (isDisposeQueued) + { + Dispose(DisposeTypes.Implicit); + } + else + { + Dispose(DisposeTypes.Explicit); + System.GC.SuppressFinalize(this); + } + } + + protected virtual void Dispose(DisposeTypes type) + { + if (disposed) + { + return; + } + + if (type == DisposeTypes.Explicit) + { + //Called by User + //Release your own managed resources here. + //You should release all of your own disposable objects here. + + } + + //Release your own unmanaged resources here. + //You should not access any managed member here except static instance. + //because the execution order of Finalizes is non-deterministic. + + if (swigCPtr.Handle != global::System.IntPtr.Zero) + { + if (swigCMemOwn) + { + swigCMemOwn = false; + NDalicPINVOKE.delete_ClampState2D(swigCPtr); + } + swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); + } + + disposed = true; + } + + + public ClampState x + { + set + { + NDalicPINVOKE.ClampState2D_x_set(swigCPtr, (int)value); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + get + { + ClampState ret = (ClampState)NDalicPINVOKE.ClampState2D_x_get(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + public ClampState y + { + set + { + NDalicPINVOKE.ClampState2D_y_set(swigCPtr, (int)value); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + get + { + ClampState ret = (ClampState)NDalicPINVOKE.ClampState2D_y_get(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + public ClampState2D() : this(NDalicPINVOKE.new_ClampState2D(), true) + { + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + } + +} diff --git a/src/Tizen.NUI/src/internal/ConnectionTrackerInterface.cs b/src/Tizen.NUI/src/internal/ConnectionTrackerInterface.cs index 20ffdf2..c8f952e 100755 --- a/src/Tizen.NUI/src/internal/ConnectionTrackerInterface.cs +++ b/src/Tizen.NUI/src/internal/ConnectionTrackerInterface.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - internal class ConnectionTrackerInterface : SignalObserver + public class ConnectionTrackerInterface : SignalObserver { private global::System.Runtime.InteropServices.HandleRef swigCPtr; diff --git a/src/Tizen.NUI/src/internal/ControlOrientationType.cs b/src/Tizen.NUI/src/internal/ControlOrientationType.cs new file mode 100755 index 0000000..6fac6b7 --- /dev/null +++ b/src/Tizen.NUI/src/internal/ControlOrientationType.cs @@ -0,0 +1,22 @@ +//------------------------------------------------------------------------------ +// +// +// 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 enum ControlOrientationType + { + Up, + Left, + Down, + Right + } + +} diff --git a/src/Tizen.NUI/src/internal/CustomActor.cs b/src/Tizen.NUI/src/internal/CustomActor.cs index b0f8ef0..27b1dde 100755 --- a/src/Tizen.NUI/src/internal/CustomActor.cs +++ b/src/Tizen.NUI/src/internal/CustomActor.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - internal class CustomActor : Animatable + public class CustomActor : Animatable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; diff --git a/src/Tizen.NUI/src/internal/CustomActorImpl.cs b/src/Tizen.NUI/src/internal/CustomActorImpl.cs index acdf68e..4bdf93e 100755 --- a/src/Tizen.NUI/src/internal/CustomActorImpl.cs +++ b/src/Tizen.NUI/src/internal/CustomActorImpl.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { using Tizen.NUI.BaseComponents; - internal class CustomActorImpl : RefObject + public class CustomActorImpl : RefObject { private global::System.Runtime.InteropServices.HandleRef swigCPtr; diff --git a/src/Tizen.NUI/src/internal/DefaultItemLayoutProperty.cs b/src/Tizen.NUI/src/internal/DefaultItemLayoutProperty.cs index 9aaa725..1ab2697 100755 --- a/src/Tizen.NUI/src/internal/DefaultItemLayoutProperty.cs +++ b/src/Tizen.NUI/src/internal/DefaultItemLayoutProperty.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - internal enum DefaultItemLayoutProperty + public enum DefaultItemLayoutProperty { TYPE = 0, ITEM_SIZE, diff --git a/src/Tizen.NUI/src/internal/DefaultItemLayoutType.cs b/src/Tizen.NUI/src/internal/DefaultItemLayoutType.cs index 216b5b6..18f06dc 100755 --- a/src/Tizen.NUI/src/internal/DefaultItemLayoutType.cs +++ b/src/Tizen.NUI/src/internal/DefaultItemLayoutType.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - internal enum DefaultItemLayoutType + public enum DefaultItemLayoutType { DEPTH, GRID, diff --git a/src/Tizen.NUI/src/internal/DefaultRuler.cs b/src/Tizen.NUI/src/internal/DefaultRuler.cs index b66e54e..dfb5163 100755 --- a/src/Tizen.NUI/src/internal/DefaultRuler.cs +++ b/src/Tizen.NUI/src/internal/DefaultRuler.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - internal class DefaultRuler : Ruler + public class DefaultRuler : Ruler { private global::System.Runtime.InteropServices.HandleRef swigCPtr; diff --git a/src/Tizen.NUI/src/public/DirectionBias.cs b/src/Tizen.NUI/src/internal/DirectionBias.cs similarity index 100% rename from src/Tizen.NUI/src/public/DirectionBias.cs rename to src/Tizen.NUI/src/internal/DirectionBias.cs diff --git a/src/Tizen.NUI/src/internal/EventThreadCallback.cs b/src/Tizen.NUI/src/internal/EventThreadCallback.cs index d8c5b1a..c234de8 100755 --- a/src/Tizen.NUI/src/internal/EventThreadCallback.cs +++ b/src/Tizen.NUI/src/internal/EventThreadCallback.cs @@ -18,7 +18,7 @@ namespace Tizen.NUI { - internal class EventThreadCallback : global::System.IDisposable + public class EventThreadCallback : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/src/Tizen.NUI/src/internal/FixedRuler.cs b/src/Tizen.NUI/src/internal/FixedRuler.cs index 56f9b8d..eddb0d5 100755 --- a/src/Tizen.NUI/src/internal/FixedRuler.cs +++ b/src/Tizen.NUI/src/internal/FixedRuler.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - internal class FixedRuler : Ruler + public class FixedRuler : Ruler { private global::System.Runtime.InteropServices.HandleRef swigCPtr; diff --git a/src/Tizen.NUI/src/internal/GestureDetector.cs b/src/Tizen.NUI/src/internal/GestureDetector.cs index 16e1c6f..28f84bf 100755 --- a/src/Tizen.NUI/src/internal/GestureDetector.cs +++ b/src/Tizen.NUI/src/internal/GestureDetector.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { using Tizen.NUI.BaseComponents; - internal class GestureDetector : BaseHandle + public class GestureDetector : BaseHandle { private global::System.Runtime.InteropServices.HandleRef swigCPtr; diff --git a/src/Tizen.NUI/src/internal/Item.cs b/src/Tizen.NUI/src/internal/Item.cs index f19261d..32022ea 100755 --- a/src/Tizen.NUI/src/internal/Item.cs +++ b/src/Tizen.NUI/src/internal/Item.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { using Tizen.NUI.BaseComponents; - internal class Item : global::System.IDisposable + public class Item : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/src/Tizen.NUI/src/internal/ItemContainer.cs b/src/Tizen.NUI/src/internal/ItemContainer.cs index b8ce824..e6d59f5 100755 --- a/src/Tizen.NUI/src/internal/ItemContainer.cs +++ b/src/Tizen.NUI/src/internal/ItemContainer.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - internal class ItemContainer : global::System.IDisposable, global::System.Collections.IEnumerable + public class ItemContainer : global::System.IDisposable, global::System.Collections.IEnumerable , global::System.Collections.Generic.IEnumerable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; diff --git a/src/Tizen.NUI/src/internal/ItemFactory.cs b/src/Tizen.NUI/src/internal/ItemFactory.cs index dc841db..c319f7f 100755 --- a/src/Tizen.NUI/src/internal/ItemFactory.cs +++ b/src/Tizen.NUI/src/internal/ItemFactory.cs @@ -16,7 +16,7 @@ using System.Reflection; namespace Tizen.NUI { using Tizen.NUI.BaseComponents; - internal class ItemFactory : global::System.IDisposable + public class ItemFactory : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/src/Tizen.NUI/src/internal/ItemIdContainer.cs b/src/Tizen.NUI/src/internal/ItemIdContainer.cs index 5e6fc76..d21e712 100755 --- a/src/Tizen.NUI/src/internal/ItemIdContainer.cs +++ b/src/Tizen.NUI/src/internal/ItemIdContainer.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - internal class ItemIdContainer : global::System.IDisposable, global::System.Collections.IEnumerable + public class ItemIdContainer : global::System.IDisposable, global::System.Collections.IEnumerable , global::System.Collections.Generic.IList { private global::System.Runtime.InteropServices.HandleRef swigCPtr; diff --git a/src/Tizen.NUI/src/internal/ItemLayout.cs b/src/Tizen.NUI/src/internal/ItemLayout.cs index 53af640..2bd2374 100755 --- a/src/Tizen.NUI/src/internal/ItemLayout.cs +++ b/src/Tizen.NUI/src/internal/ItemLayout.cs @@ -13,7 +13,7 @@ using Tizen.NUI.BaseComponents; namespace Tizen.NUI { - internal class ItemLayout : RefObject + public class ItemLayout : RefObject { private global::System.Runtime.InteropServices.HandleRef swigCPtr; @@ -59,6 +59,18 @@ namespace Tizen.NUI base.Dispose(type); } + public void SetOrientation(ControlOrientationType orientation) + { + NDalicPINVOKE.ItemLayout_SetOrientation(swigCPtr, (int)orientation); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public ControlOrientationType GetOrientation() + { + ControlOrientationType ret = (ControlOrientationType)NDalicPINVOKE.ItemLayout_GetOrientation(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } public void SetLayoutProperties(PropertyMap properties) { diff --git a/src/Tizen.NUI/src/internal/ItemRange.cs b/src/Tizen.NUI/src/internal/ItemRange.cs index 0ccd36d..9fe58c4 100755 --- a/src/Tizen.NUI/src/internal/ItemRange.cs +++ b/src/Tizen.NUI/src/internal/ItemRange.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - internal class ItemRange : global::System.IDisposable + public class ItemRange : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/src/Tizen.NUI/src/internal/ItemView.cs b/src/Tizen.NUI/src/internal/ItemView.cs index 85728d1..b29dd55 100755 --- a/src/Tizen.NUI/src/internal/ItemView.cs +++ b/src/Tizen.NUI/src/internal/ItemView.cs @@ -33,7 +33,7 @@ namespace Tizen.NUI using System.Runtime.InteropServices; - internal class ItemView : Scrollable + public class ItemView : Scrollable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; diff --git a/src/Tizen.NUI/src/public/KeyInputFocusManager.cs b/src/Tizen.NUI/src/internal/KeyInputFocusManager.cs similarity index 100% rename from src/Tizen.NUI/src/public/KeyInputFocusManager.cs rename to src/Tizen.NUI/src/internal/KeyInputFocusManager.cs diff --git a/src/Tizen.NUI/src/internal/PreFocusChangeSignal.cs b/src/Tizen.NUI/src/internal/KeyboardPreFocusChangeSignal.cs similarity index 99% rename from src/Tizen.NUI/src/internal/PreFocusChangeSignal.cs rename to src/Tizen.NUI/src/internal/KeyboardPreFocusChangeSignal.cs index 78799a7..bef6ed1 100755 --- a/src/Tizen.NUI/src/internal/PreFocusChangeSignal.cs +++ b/src/Tizen.NUI/src/internal/KeyboardPreFocusChangeSignal.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. diff --git a/src/Tizen.NUI/src/internal/LongPressGestureDetector.cs b/src/Tizen.NUI/src/internal/LongPressGestureDetector.cs index 4977c03..1a31ed3 100755 --- a/src/Tizen.NUI/src/internal/LongPressGestureDetector.cs +++ b/src/Tizen.NUI/src/internal/LongPressGestureDetector.cs @@ -31,7 +31,7 @@ namespace Tizen.NUI using System.Runtime.InteropServices; using Tizen.NUI.BaseComponents; - internal class LongPressGestureDetector : GestureDetector + public class LongPressGestureDetector : GestureDetector { private global::System.Runtime.InteropServices.HandleRef swigCPtr; diff --git a/src/Tizen.NUI/src/internal/Meta.cs b/src/Tizen.NUI/src/internal/Meta.cs new file mode 100755 index 0000000..6fb90b3 --- /dev/null +++ b/src/Tizen.NUI/src/internal/Meta.cs @@ -0,0 +1,19 @@ +//------------------------------------------------------------------------------ +// +// +// This file was automatically generated by SWIG (http://www.swig.org). +// Version 3.0.9 +// +// Do not make changes to this file unless you know what you are doing--modify +// the SWIG interface file instead. +//------------------------------------------------------------------------------ + +namespace Tizen.NUI +{ + + internal enum Meta + { + DIMENSION_COUNT = 2 + } + +} diff --git a/src/Tizen.NUI/src/internal/NDalic.cs b/src/Tizen.NUI/src/internal/NDalic.cs index cb47707..132fb2d 100755 --- a/src/Tizen.NUI/src/internal/NDalic.cs +++ b/src/Tizen.NUI/src/internal/NDalic.cs @@ -502,6 +502,13 @@ namespace Tizen.NUI return ret; } + public static PropertyCondition VariableStepCondition(VectorFloat steps) + { + PropertyCondition ret = new PropertyCondition(NDalicPINVOKE.VariableStepCondition(VectorFloat.getCPtr(steps)), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + public static int WEIGHT { get @@ -1293,6 +1300,19 @@ namespace Tizen.NUI return ret; } + public static bool IsVertical(ControlOrientationType orientation) + { + bool ret = NDalicPINVOKE.IsVertical((int)orientation); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public static bool IsHorizontal(ControlOrientationType orientation) + { + bool ret = NDalicPINVOKE.IsHorizontal((int)orientation); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } public static SWIGTYPE_p_Dali__IntrusivePtrT_Dali__Toolkit__ItemLayout_t NewItemLayout(DefaultItemLayoutType type) { diff --git a/src/Tizen.NUI/src/internal/NDalicPINVOKE.cs b/src/Tizen.NUI/src/internal/NDalicPINVOKE.cs index 46c5a6a..6268803 100755 --- a/src/Tizen.NUI/src/internal/NDalicPINVOKE.cs +++ b/src/Tizen.NUI/src/internal/NDalicPINVOKE.cs @@ -8418,9 +8418,6 @@ class NDalicPINVOKE { [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_ScrollView_Property_WHEEL_SCROLL_DISTANCE_STEP_get")] public static extern int ScrollView_Property_WHEEL_SCROLL_DISTANCE_STEP_get(); - [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_ScrollView_Property_SCROLL_MODE_get")] - public static extern int ScrollView_Property_SCROLL_MODE_get(); - [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_ScrollView_Property_SCROLL_POSITION_get")] public static extern int ScrollView_Property_SCROLL_POSITION_get(); diff --git a/src/Tizen.NUI/src/internal/Object.cs b/src/Tizen.NUI/src/internal/Object.cs index b59f3c2..37f15ec 100755 --- a/src/Tizen.NUI/src/internal/Object.cs +++ b/src/Tizen.NUI/src/internal/Object.cs @@ -22,7 +22,7 @@ namespace Tizen.NUI { - internal static class Object + public static class Object { public static PropertyValue GetProperty(global::System.Runtime.InteropServices.HandleRef handle, int index) { diff --git a/src/Tizen.NUI/src/public/PaddingType.cs b/src/Tizen.NUI/src/internal/PaddingType.cs similarity index 100% rename from src/Tizen.NUI/src/public/PaddingType.cs rename to src/Tizen.NUI/src/internal/PaddingType.cs diff --git a/src/Tizen.NUI/src/internal/PanGestureDetector.cs b/src/Tizen.NUI/src/internal/PanGestureDetector.cs index aa8d049..7217c17 100755 --- a/src/Tizen.NUI/src/internal/PanGestureDetector.cs +++ b/src/Tizen.NUI/src/internal/PanGestureDetector.cs @@ -32,7 +32,7 @@ namespace Tizen.NUI using Tizen.NUI.BaseComponents; - internal class PanGestureDetector : GestureDetector + public class PanGestureDetector : GestureDetector { private global::System.Runtime.InteropServices.HandleRef swigCPtr; diff --git a/src/Tizen.NUI/src/internal/PinchGestureDetector.cs b/src/Tizen.NUI/src/internal/PinchGestureDetector.cs index fc81c72..566e0f9 100755 --- a/src/Tizen.NUI/src/internal/PinchGestureDetector.cs +++ b/src/Tizen.NUI/src/internal/PinchGestureDetector.cs @@ -32,7 +32,7 @@ namespace Tizen.NUI using Tizen.NUI.BaseComponents; - internal class PinchGestureDetector : GestureDetector + public class PinchGestureDetector : GestureDetector { private global::System.Runtime.InteropServices.HandleRef swigCPtr; diff --git a/src/Tizen.NUI/src/public/UIComponents/Popup.cs b/src/Tizen.NUI/src/internal/Popup.cs similarity index 100% rename from src/Tizen.NUI/src/public/UIComponents/Popup.cs rename to src/Tizen.NUI/src/internal/Popup.cs diff --git a/src/Tizen.NUI/src/internal/PositionInheritanceMode.cs b/src/Tizen.NUI/src/internal/PositionInheritanceMode.cs new file mode 100755 index 0000000..a04a2e4 --- /dev/null +++ b/src/Tizen.NUI/src/internal/PositionInheritanceMode.cs @@ -0,0 +1,22 @@ +//------------------------------------------------------------------------------ +// +// +// 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 +{ + + internal enum PositionInheritanceMode + { + INHERIT_PARENT_POSITION, + USE_PARENT_POSITION, + USE_PARENT_POSITION_PLUS_LOCAL_POSITION, + DONT_INHERIT_POSITION + } + +} diff --git a/src/Tizen.NUI/src/public/ProgressBar.cs b/src/Tizen.NUI/src/internal/ProgressBar.cs similarity index 100% rename from src/Tizen.NUI/src/public/ProgressBar.cs rename to src/Tizen.NUI/src/internal/ProgressBar.cs diff --git a/src/Tizen.NUI/src/internal/ProgressBarValueChangedSignal.cs b/src/Tizen.NUI/src/internal/ProgressBarValueChangedSignal.cs index e84de67..1c6fc85 100755 --- a/src/Tizen.NUI/src/internal/ProgressBarValueChangedSignal.cs +++ b/src/Tizen.NUI/src/internal/ProgressBarValueChangedSignal.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - internal class ProgressBarValueChangedSignal : global::System.IDisposable + public class ProgressBarValueChangedSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/src/Tizen.NUI/src/public/UIComponents/RadioButton.cs b/src/Tizen.NUI/src/internal/RadioButton.cs similarity index 100% rename from src/Tizen.NUI/src/public/UIComponents/RadioButton.cs rename to src/Tizen.NUI/src/internal/RadioButton.cs diff --git a/src/Tizen.NUI/src/internal/RefObject.cs b/src/Tizen.NUI/src/internal/RefObject.cs index 4f5c79a..e46c92e 100755 --- a/src/Tizen.NUI/src/internal/RefObject.cs +++ b/src/Tizen.NUI/src/internal/RefObject.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - internal class RefObject : global::System.IDisposable + public class RefObject : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/src/Tizen.NUI/src/internal/Ruler.cs b/src/Tizen.NUI/src/internal/Ruler.cs index 5b87186..fc1b960 100755 --- a/src/Tizen.NUI/src/internal/Ruler.cs +++ b/src/Tizen.NUI/src/internal/Ruler.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - internal class Ruler : RefObject + public class Ruler : RefObject { private global::System.Runtime.InteropServices.HandleRef swigCPtr; diff --git a/src/Tizen.NUI/src/internal/RulerDomain.cs b/src/Tizen.NUI/src/internal/RulerDomain.cs index 18b8609..cbe2b4b 100755 --- a/src/Tizen.NUI/src/internal/RulerDomain.cs +++ b/src/Tizen.NUI/src/internal/RulerDomain.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - internal class RulerDomain : global::System.IDisposable + public class RulerDomain : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/src/Tizen.NUI/src/internal/RulerPtr.cs b/src/Tizen.NUI/src/internal/RulerPtr.cs index 8f660dc..2ab91cf 100755 --- a/src/Tizen.NUI/src/internal/RulerPtr.cs +++ b/src/Tizen.NUI/src/internal/RulerPtr.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - internal class RulerPtr : global::System.IDisposable + public class RulerPtr : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/src/Tizen.NUI/src/internal/SWIGTYPE_p_CallbackBase.cs b/src/Tizen.NUI/src/internal/SWIGTYPE_p_CallbackBase.cs index 0191095..1f7ceab 100755 --- a/src/Tizen.NUI/src/internal/SWIGTYPE_p_CallbackBase.cs +++ b/src/Tizen.NUI/src/internal/SWIGTYPE_p_CallbackBase.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - internal class SWIGTYPE_p_CallbackBase + public class SWIGTYPE_p_CallbackBase { private global::System.Runtime.InteropServices.HandleRef swigCPtr; diff --git a/src/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__CallbackBase.cs b/src/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__CallbackBase.cs index 22ff2b9..9acac7f 100755 --- a/src/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__CallbackBase.cs +++ b/src/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__CallbackBase.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - internal class SWIGTYPE_p_Dali__CallbackBase + public class SWIGTYPE_p_Dali__CallbackBase { private global::System.Runtime.InteropServices.HandleRef swigCPtr; diff --git a/src/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__FunctorDelegate.cs b/src/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__FunctorDelegate.cs index 1e123d8..1af9222 100755 --- a/src/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__FunctorDelegate.cs +++ b/src/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__FunctorDelegate.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - internal class SWIGTYPE_p_Dali__FunctorDelegate + public class SWIGTYPE_p_Dali__FunctorDelegate { private global::System.Runtime.InteropServices.HandleRef swigCPtr; diff --git a/src/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__Internal__Texture.cs b/src/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__Internal__Texture.cs index 3fbcf72..e16bc39 100755 --- a/src/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__Internal__Texture.cs +++ b/src/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__Internal__Texture.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - internal class SWIGTYPE_p_Dali__Internal__Texture + public class SWIGTYPE_p_Dali__Internal__Texture { private global::System.Runtime.InteropServices.HandleRef swigCPtr; diff --git a/src/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__IntrusivePtrT_Dali__Toolkit__ItemLayout_t.cs b/src/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__IntrusivePtrT_Dali__Toolkit__ItemLayout_t.cs index b6a2520..5490134 100755 --- a/src/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__IntrusivePtrT_Dali__Toolkit__ItemLayout_t.cs +++ b/src/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__IntrusivePtrT_Dali__Toolkit__ItemLayout_t.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - internal class SWIGTYPE_p_Dali__IntrusivePtrT_Dali__Toolkit__ItemLayout_t + public class SWIGTYPE_p_Dali__IntrusivePtrT_Dali__Toolkit__ItemLayout_t { private global::System.Runtime.InteropServices.HandleRef swigCPtr; diff --git a/src/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__Actor_bool_Dali__DevelActor__VisibilityChange__TypeF_t.cs b/src/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__Actor_bool_Dali__DevelActor__VisibilityChange__TypeF_t.cs index f07cda2..0ca2c39 100755 --- a/src/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__Actor_bool_Dali__DevelActor__VisibilityChange__TypeF_t.cs +++ b/src/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__Actor_bool_Dali__DevelActor__VisibilityChange__TypeF_t.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - internal class SWIGTYPE_p_Dali__SignalT_void_fDali__Actor_bool_Dali__DevelActor__VisibilityChange__TypeF_t + public class SWIGTYPE_p_Dali__SignalT_void_fDali__Actor_bool_Dali__DevelActor__VisibilityChange__TypeF_t { private global::System.Runtime.InteropServices.HandleRef swigCPtr; diff --git a/src/Tizen.NUI/src/public/UIComponents/ScrollView.cs b/src/Tizen.NUI/src/internal/ScrollView.cs similarity index 94% rename from src/Tizen.NUI/src/public/UIComponents/ScrollView.cs rename to src/Tizen.NUI/src/internal/ScrollView.cs index 9fd9ae8..f97eb60 100755 --- a/src/Tizen.NUI/src/public/UIComponents/ScrollView.cs +++ b/src/Tizen.NUI/src/internal/ScrollView.cs @@ -246,6 +246,53 @@ namespace Tizen.NUI disposed = true; } + internal ClampState2D scale + { + set + { + NDalicPINVOKE.ScrollView_ClampEvent_scale_set(swigCPtr, ClampState2D.getCPtr(value)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.ScrollView_ClampEvent_scale_get(swigCPtr); + ClampState2D ret = (cPtr == global::System.IntPtr.Zero) ? null : new ClampState2D(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + internal ClampState2D position + { + set + { + NDalicPINVOKE.ScrollView_ClampEvent_position_set(swigCPtr, ClampState2D.getCPtr(value)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.ScrollView_ClampEvent_position_get(swigCPtr); + ClampState2D ret = (cPtr == global::System.IntPtr.Zero) ? null : new ClampState2D(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + internal ClampState rotation + { + set + { + NDalicPINVOKE.ScrollView_ClampEvent_rotation_set(swigCPtr, (int)value); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + get + { + ClampState ret = (ClampState)NDalicPINVOKE.ScrollView_ClampEvent_rotation_get(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public ClampEvent() : this(NDalicPINVOKE.new_ScrollView_ClampEvent(), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -486,7 +533,6 @@ namespace Tizen.NUI public static readonly int PANNING_ENABLED = NDalicPINVOKE.ScrollView_Property_PANNING_ENABLED_get(); public static readonly int AXIS_AUTO_LOCK_ENABLED = NDalicPINVOKE.ScrollView_Property_AXIS_AUTO_LOCK_ENABLED_get(); public static readonly int WHEEL_SCROLL_DISTANCE_STEP = NDalicPINVOKE.ScrollView_Property_WHEEL_SCROLL_DISTANCE_STEP_get(); - public static readonly int SCROLL_MODE = NDalicPINVOKE.ScrollView_Property_SCROLL_MODE_get(); public static readonly int SCROLL_POSITION = NDalicPINVOKE.ScrollView_Property_SCROLL_POSITION_get(); public static readonly int SCROLL_PRE_POSITION = NDalicPINVOKE.ScrollView_Property_SCROLL_PRE_POSITION_get(); public static readonly int SCROLL_PRE_POSITION_X = NDalicPINVOKE.ScrollView_Property_SCROLL_PRE_POSITION_X_get(); @@ -587,6 +633,17 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } + public void SetRulerX(RulerPtr ruler) + { + NDalicPINVOKE.ScrollView_SetRulerX(swigCPtr, RulerPtr.getCPtr(ruler)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public void SetRulerY(RulerPtr ruler) + { + NDalicPINVOKE.ScrollView_SetRulerY(swigCPtr, RulerPtr.getCPtr(ruler)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } public void SetScrollSensitive(bool sensitive) { @@ -1119,21 +1176,6 @@ namespace Tizen.NUI } } - public PropertyMap ScrollMode - { - get - { - PropertyValue value = GetProperty( ScrollView.Property.SCROLL_MODE ); - PropertyMap map = new PropertyMap(); - value.Get( map ); - return map; - } - set - { - SetProperty( ScrollView.Property.SCROLL_MODE, new PropertyValue( value ) ); - } - } - } } diff --git a/src/Tizen.NUI/src/public/ScrollViewEffect.cs b/src/Tizen.NUI/src/internal/ScrollViewEffect.cs similarity index 100% rename from src/Tizen.NUI/src/public/ScrollViewEffect.cs rename to src/Tizen.NUI/src/internal/ScrollViewEffect.cs diff --git a/src/Tizen.NUI/src/public/Scrollable.cs b/src/Tizen.NUI/src/internal/Scrollable.cs similarity index 100% rename from src/Tizen.NUI/src/public/Scrollable.cs rename to src/Tizen.NUI/src/internal/Scrollable.cs diff --git a/src/Tizen.NUI/src/internal/SignalObserver.cs b/src/Tizen.NUI/src/internal/SignalObserver.cs index 3f2bbfb..1eb0b2e 100755 --- a/src/Tizen.NUI/src/internal/SignalObserver.cs +++ b/src/Tizen.NUI/src/internal/SignalObserver.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - internal class SignalObserver : global::System.IDisposable + public class SignalObserver : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/src/Tizen.NUI/src/public/Size.cs b/src/Tizen.NUI/src/internal/Size.cs similarity index 100% rename from src/Tizen.NUI/src/public/Size.cs rename to src/Tizen.NUI/src/internal/Size.cs diff --git a/src/Tizen.NUI/src/internal/Slider.cs b/src/Tizen.NUI/src/internal/Slider.cs index 5ab6157..6f4e930 100755 --- a/src/Tizen.NUI/src/internal/Slider.cs +++ b/src/Tizen.NUI/src/internal/Slider.cs @@ -34,7 +34,7 @@ namespace Tizen.NUI.UIComponents /// /// Slider is a control to enable sliding an indicator between two values. /// - internal class Slider : View + public class Slider : View { private global::System.Runtime.InteropServices.HandleRef swigCPtr; diff --git a/src/Tizen.NUI/src/internal/SlotObserver.cs b/src/Tizen.NUI/src/internal/SlotObserver.cs index a75a4ea..a5fdab1 100755 --- a/src/Tizen.NUI/src/internal/SlotObserver.cs +++ b/src/Tizen.NUI/src/internal/SlotObserver.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - internal class SlotObserver : global::System.IDisposable + public class SlotObserver : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/src/Tizen.NUI/src/internal/TapGestureDetector.cs b/src/Tizen.NUI/src/internal/TapGestureDetector.cs index ded1004..0390e45 100755 --- a/src/Tizen.NUI/src/internal/TapGestureDetector.cs +++ b/src/Tizen.NUI/src/internal/TapGestureDetector.cs @@ -31,7 +31,7 @@ namespace Tizen.NUI using System.Runtime.InteropServices; using Tizen.NUI.BaseComponents; - internal class TapGestureDetector : GestureDetector + public class TapGestureDetector : GestureDetector { private global::System.Runtime.InteropServices.HandleRef swigCPtr; diff --git a/src/Tizen.NUI/src/public/UIComponents/ToggleButton.cs b/src/Tizen.NUI/src/internal/ToggleButton.cs similarity index 100% rename from src/Tizen.NUI/src/public/UIComponents/ToggleButton.cs rename to src/Tizen.NUI/src/internal/ToggleButton.cs diff --git a/src/Tizen.NUI/src/public/TransitionData.cs b/src/Tizen.NUI/src/internal/TransitionData.cs similarity index 100% rename from src/Tizen.NUI/src/public/TransitionData.cs rename to src/Tizen.NUI/src/internal/TransitionData.cs diff --git a/src/Tizen.NUI/src/internal/TypeInfo.cs b/src/Tizen.NUI/src/internal/TypeInfo.cs index 2107cd3..44196e9 100755 --- a/src/Tizen.NUI/src/internal/TypeInfo.cs +++ b/src/Tizen.NUI/src/internal/TypeInfo.cs @@ -131,6 +131,12 @@ namespace Tizen.NUI return ret; } + internal void GetPropertyIndices(VectorInteger indices) + { + NDalicPINVOKE.TypeInfo_GetPropertyIndices(swigCPtr, VectorInteger.getCPtr(indices)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + public string GetPropertyName(int index) { string ret = NDalicPINVOKE.TypeInfo_GetPropertyName(swigCPtr, index); diff --git a/src/Tizen.NUI/src/internal/VectorFloat.cs b/src/Tizen.NUI/src/internal/VectorFloat.cs new file mode 100755 index 0000000..1b35b38 --- /dev/null +++ b/src/Tizen.NUI/src/internal/VectorFloat.cs @@ -0,0 +1,216 @@ +//------------------------------------------------------------------------------ +// +// +// 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 +{ + + internal class VectorFloat : global::System.IDisposable + { + private global::System.Runtime.InteropServices.HandleRef swigCPtr; + protected bool swigCMemOwn; + + internal VectorFloat(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(VectorFloat obj) + { + return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; + } + + //A Flag to check who called Dispose(). (By User or DisposeQueue) + private bool isDisposeQueued = false; + //A Flat to check if it is already disposed. + protected bool disposed = false; + + + ~VectorFloat() + { + if (!isDisposeQueued) + { + isDisposeQueued = true; + DisposeQueue.Instance.Add(this); + } + } + + public void Dispose() + { + //Throw excpetion if Dispose() is called in separate thread. + if (!Window.IsInstalled()) + { + throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread."); + } + + if (isDisposeQueued) + { + Dispose(DisposeTypes.Implicit); + } + else + { + Dispose(DisposeTypes.Explicit); + System.GC.SuppressFinalize(this); + } + } + + protected virtual void Dispose(DisposeTypes type) + { + if (disposed) + { + return; + } + + if (type == DisposeTypes.Explicit) + { + //Called by User + //Release your own managed resources here. + //You should release all of your own disposable objects here. + + } + + //Release your own unmanaged resources here. + //You should not access any managed member here except static instance. + //because the execution order of Finalizes is non-deterministic. + + if (swigCPtr.Handle != global::System.IntPtr.Zero) + { + if (swigCMemOwn) + { + swigCMemOwn = false; + NDalicPINVOKE.delete_VectorFloat(swigCPtr); + } + swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); + } + + disposed = true; + } + + public VectorFloat() : this(NDalicPINVOKE.new_VectorFloat__SWIG_0(), true) + { + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public VectorFloat(VectorFloat vector) : this(NDalicPINVOKE.new_VectorFloat__SWIG_1(VectorFloat.getCPtr(vector)), true) + { + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public VectorFloat Assign(VectorFloat vector) + { + VectorFloat ret = new VectorFloat(NDalicPINVOKE.VectorFloat_Assign(swigCPtr, VectorFloat.getCPtr(vector)), false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public SWIGTYPE_p_float Begin() + { + global::System.IntPtr cPtr = NDalicPINVOKE.VectorFloat_Begin(swigCPtr); + SWIGTYPE_p_float ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_float(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public SWIGTYPE_p_float End() + { + global::System.IntPtr cPtr = NDalicPINVOKE.VectorFloat_End(swigCPtr); + SWIGTYPE_p_float ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_float(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public SWIGTYPE_p_float ValueOfIndex(uint index) + { + SWIGTYPE_p_float ret = new SWIGTYPE_p_float(NDalicPINVOKE.VectorFloat_ValueOfIndex__SWIG_0(swigCPtr, index), false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public void PushBack(float element) + { + NDalicPINVOKE.VectorFloat_PushBack(swigCPtr, element); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public void Insert(SWIGTYPE_p_float at, float element) + { + NDalicPINVOKE.VectorFloat_Insert__SWIG_0(swigCPtr, SWIGTYPE_p_float.getCPtr(at), element); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public void Insert(SWIGTYPE_p_float at, SWIGTYPE_p_float from, SWIGTYPE_p_float to) + { + NDalicPINVOKE.VectorFloat_Insert__SWIG_1(swigCPtr, SWIGTYPE_p_float.getCPtr(at), SWIGTYPE_p_float.getCPtr(from), SWIGTYPE_p_float.getCPtr(to)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public void Reserve(uint count) + { + NDalicPINVOKE.VectorFloat_Reserve(swigCPtr, count); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public void Resize(uint count) + { + NDalicPINVOKE.VectorFloat_Resize__SWIG_0(swigCPtr, count); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public void Resize(uint count, float item) + { + NDalicPINVOKE.VectorFloat_Resize__SWIG_1(swigCPtr, count, item); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public SWIGTYPE_p_float Erase(SWIGTYPE_p_float iterator) + { + global::System.IntPtr cPtr = NDalicPINVOKE.VectorFloat_Erase__SWIG_0(swigCPtr, SWIGTYPE_p_float.getCPtr(iterator)); + SWIGTYPE_p_float ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_float(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public SWIGTYPE_p_float Erase(SWIGTYPE_p_float first, SWIGTYPE_p_float last) + { + global::System.IntPtr cPtr = NDalicPINVOKE.VectorFloat_Erase__SWIG_1(swigCPtr, SWIGTYPE_p_float.getCPtr(first), SWIGTYPE_p_float.getCPtr(last)); + SWIGTYPE_p_float ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_float(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public void Remove(SWIGTYPE_p_float iterator) + { + NDalicPINVOKE.VectorFloat_Remove(swigCPtr, SWIGTYPE_p_float.getCPtr(iterator)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public void Swap(VectorFloat vector) + { + NDalicPINVOKE.VectorFloat_Swap(swigCPtr, VectorFloat.getCPtr(vector)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public void Clear() + { + NDalicPINVOKE.VectorFloat_Clear(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public void Release() + { + NDalicPINVOKE.VectorFloat_Release(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public static readonly int BaseType = NDalicPINVOKE.VectorFloat_BaseType_get(); + + } + +} diff --git a/src/Tizen.NUI/src/internal/VectorInteger.cs b/src/Tizen.NUI/src/internal/VectorInteger.cs new file mode 100755 index 0000000..de342c0 --- /dev/null +++ b/src/Tizen.NUI/src/internal/VectorInteger.cs @@ -0,0 +1,218 @@ +//------------------------------------------------------------------------------ +// +// +// 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 +{ + + internal class VectorInteger : global::System.IDisposable + { + private global::System.Runtime.InteropServices.HandleRef swigCPtr; + protected bool swigCMemOwn; + + internal VectorInteger(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(VectorInteger obj) + { + return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; + } + + //A Flag to check who called Dispose(). (By User or DisposeQueue) + private bool isDisposeQueued = false; + //A Flat to check if it is already disposed. + protected bool disposed = false; + + + ~VectorInteger() + { + if (!isDisposeQueued) + { + isDisposeQueued = true; + DisposeQueue.Instance.Add(this); + } + } + + public void Dispose() + { + //Throw excpetion if Dispose() is called in separate thread. + if (!Window.IsInstalled()) + { + throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread."); + } + + if (isDisposeQueued) + { + Dispose(DisposeTypes.Implicit); + } + else + { + Dispose(DisposeTypes.Explicit); + System.GC.SuppressFinalize(this); + } + } + + protected virtual void Dispose(DisposeTypes type) + { + if (disposed) + { + return; + } + + if (type == DisposeTypes.Explicit) + { + //Called by User + //Release your own managed resources here. + //You should release all of your own disposable objects here. + + } + + //Release your own unmanaged resources here. + //You should not access any managed member here except static instance. + //because the execution order of Finalizes is non-deterministic. + + if (swigCPtr.Handle != global::System.IntPtr.Zero) + { + if (swigCMemOwn) + { + swigCMemOwn = false; + NDalicPINVOKE.delete_VectorInteger(swigCPtr); + } + swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); + } + + disposed = true; + } + + + + public VectorInteger() : this(NDalicPINVOKE.new_VectorInteger__SWIG_0(), true) + { + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public VectorInteger(VectorInteger vector) : this(NDalicPINVOKE.new_VectorInteger__SWIG_1(VectorInteger.getCPtr(vector)), true) + { + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public VectorInteger Assign(VectorInteger vector) + { + VectorInteger ret = new VectorInteger(NDalicPINVOKE.VectorInteger_Assign(swigCPtr, VectorInteger.getCPtr(vector)), false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public SWIGTYPE_p_int Begin() + { + global::System.IntPtr cPtr = NDalicPINVOKE.VectorInteger_Begin(swigCPtr); + SWIGTYPE_p_int ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_int(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public SWIGTYPE_p_int End() + { + global::System.IntPtr cPtr = NDalicPINVOKE.VectorInteger_End(swigCPtr); + SWIGTYPE_p_int ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_int(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public SWIGTYPE_p_int ValueOfIndex(uint index) + { + SWIGTYPE_p_int ret = new SWIGTYPE_p_int(NDalicPINVOKE.VectorInteger_ValueOfIndex__SWIG_0(swigCPtr, index), false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public void PushBack(int element) + { + NDalicPINVOKE.VectorInteger_PushBack(swigCPtr, element); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public void Insert(SWIGTYPE_p_int at, int element) + { + NDalicPINVOKE.VectorInteger_Insert__SWIG_0(swigCPtr, SWIGTYPE_p_int.getCPtr(at), element); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public void Insert(SWIGTYPE_p_int at, SWIGTYPE_p_int from, SWIGTYPE_p_int to) + { + NDalicPINVOKE.VectorInteger_Insert__SWIG_1(swigCPtr, SWIGTYPE_p_int.getCPtr(at), SWIGTYPE_p_int.getCPtr(from), SWIGTYPE_p_int.getCPtr(to)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public void Reserve(uint count) + { + NDalicPINVOKE.VectorInteger_Reserve(swigCPtr, count); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public void Resize(uint count) + { + NDalicPINVOKE.VectorInteger_Resize__SWIG_0(swigCPtr, count); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public void Resize(uint count, int item) + { + NDalicPINVOKE.VectorInteger_Resize__SWIG_1(swigCPtr, count, item); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public SWIGTYPE_p_int Erase(SWIGTYPE_p_int iterator) + { + global::System.IntPtr cPtr = NDalicPINVOKE.VectorInteger_Erase__SWIG_0(swigCPtr, SWIGTYPE_p_int.getCPtr(iterator)); + SWIGTYPE_p_int ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_int(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public SWIGTYPE_p_int Erase(SWIGTYPE_p_int first, SWIGTYPE_p_int last) + { + global::System.IntPtr cPtr = NDalicPINVOKE.VectorInteger_Erase__SWIG_1(swigCPtr, SWIGTYPE_p_int.getCPtr(first), SWIGTYPE_p_int.getCPtr(last)); + SWIGTYPE_p_int ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_int(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public void Remove(SWIGTYPE_p_int iterator) + { + NDalicPINVOKE.VectorInteger_Remove(swigCPtr, SWIGTYPE_p_int.getCPtr(iterator)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public void Swap(VectorInteger vector) + { + NDalicPINVOKE.VectorInteger_Swap(swigCPtr, VectorInteger.getCPtr(vector)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public void Clear() + { + NDalicPINVOKE.VectorInteger_Clear(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public void Release() + { + NDalicPINVOKE.VectorInteger_Release(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public static readonly int BaseType = NDalicPINVOKE.VectorInteger_BaseType_get(); + + } + +} diff --git a/src/Tizen.NUI/src/internal/ViewContainer.cs b/src/Tizen.NUI/src/internal/ViewContainer.cs new file mode 100755 index 0000000..8f1e23b --- /dev/null +++ b/src/Tizen.NUI/src/internal/ViewContainer.cs @@ -0,0 +1,422 @@ +//------------------------------------------------------------------------------ +// +// +// 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 +{ + using Tizen.NUI.BaseComponents; + + 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 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(ViewContainer obj) + { + return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; + } + + //A Flag to check who called Dispose(). (By User or DisposeQueue) + private bool isDisposeQueued = false; + //A Flat to check if it is already disposed. + protected bool disposed = false; + + + ~ViewContainer() + { + if (!isDisposeQueued) + { + isDisposeQueued = true; + DisposeQueue.Instance.Add(this); + } + } + + public void Dispose() + { + //Throw excpetion if Dispose() is called in separate thread. + if (!Window.IsInstalled()) + { + throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread."); + } + + if (isDisposeQueued) + { + Dispose(DisposeTypes.Implicit); + } + else + { + Dispose(DisposeTypes.Explicit); + System.GC.SuppressFinalize(this); + } + } + + protected virtual void Dispose(DisposeTypes type) + { + if (disposed) + { + return; + } + + if (type == DisposeTypes.Explicit) + { + //Called by User + //Release your own managed resources here. + //You should release all of your own disposable objects here. + + } + + //Release your own unmanaged resources here. + //You should not access any managed member here except static instance. + //because the execution order of Finalizes is non-deterministic. + + if (swigCPtr.Handle != global::System.IntPtr.Zero) + { + if (swigCMemOwn) + { + swigCMemOwn = false; + NDalicPINVOKE.delete_ActorContainer(swigCPtr); + } + swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); + } + + disposed = true; + } + + + + public ViewContainer(global::System.Collections.ICollection c) : this() + { + if (c == null) + throw new global::System.ArgumentNullException("c"); + foreach (View element in c) + { + this.Add(element); + } + } + + public bool IsFixedSize + { + get + { + return false; + } + } + + public bool IsReadOnly + { + get + { + return false; + } + } + + public View this[int index] + { + get + { + return getitem(index); + } + set + { + setitem(index, value); + } + } + + public int Capacity + { + get + { + return (int)capacity(); + } + set + { + if (value < size()) + throw new global::System.ArgumentOutOfRangeException("Capacity"); + reserve((uint)value); + } + } + + public int Count + { + get + { + return (int)size(); + } + } + + public bool IsSynchronized + { + get + { + return false; + } + } + + public void CopyTo(View[] array) + { + CopyTo(0, array, 0, this.Count); + } + + public void CopyTo(View[] array, int arrayIndex) + { + CopyTo(0, array, arrayIndex, this.Count); + } + + public void CopyTo(int index, View[] array, int arrayIndex, int count) + { + if (array == null) + throw new global::System.ArgumentNullException("array"); + if (index < 0) + throw new global::System.ArgumentOutOfRangeException("index", "Value is less than zero"); + if (arrayIndex < 0) + throw new global::System.ArgumentOutOfRangeException("arrayIndex", "Value is less than zero"); + if (count < 0) + throw new global::System.ArgumentOutOfRangeException("count", "Value is less than zero"); + if (array.Rank > 1) + throw new global::System.ArgumentException("Multi dimensional array.", "array"); + if (index + count > this.Count || arrayIndex + count > array.Length) + throw new global::System.ArgumentException("Number of elements to copy is too large."); + for (int i = 0; i < count; i++) + array.SetValue(getitemcopy(index + i), arrayIndex + i); + } + + 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 ViewContainerEnumerator(this); + } + + public ViewContainerEnumerator GetEnumerator() + { + return new ViewContainerEnumerator(this); + } + + // Type-safe enumerator + /// Note that the IEnumerator documentation requires an InvalidOperationException to be thrown + /// 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 ViewContainerEnumerator : global::System.Collections.IEnumerator + , global::System.Collections.Generic.IEnumerator + { + private ViewContainer collectionRef; + private int currentIndex; + private object currentObject; + private int currentSize; + + public ViewContainerEnumerator(ViewContainer collection) + { + collectionRef = collection; + currentIndex = -1; + currentObject = null; + currentSize = collectionRef.Count; + } + + // Type-safe iterator Current + public View Current + { + get + { + if (currentIndex == -1) + throw new global::System.InvalidOperationException("Enumeration not started."); + if (currentIndex > currentSize - 1) + throw new global::System.InvalidOperationException("Enumeration finished."); + if (currentObject == null) + throw new global::System.InvalidOperationException("Collection modified."); + return (View)currentObject; + } + } + + // Type-unsafe IEnumerator.Current + object global::System.Collections.IEnumerator.Current + { + get + { + return Current; + } + } + + public bool MoveNext() + { + int size = collectionRef.Count; + bool moveOkay = (currentIndex + 1 < size) && (size == currentSize); + if (moveOkay) + { + currentIndex++; + currentObject = collectionRef[currentIndex]; + } + else + { + currentObject = null; + } + return moveOkay; + } + + public void Reset() + { + currentIndex = -1; + currentObject = null; + if (collectionRef.Count != currentSize) + { + throw new global::System.InvalidOperationException("Collection modified."); + } + } + + public void Dispose() + { + currentIndex = -1; + currentObject = null; + } + } + + public void Clear() + { + NDalicPINVOKE.ActorContainer_Clear(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public void Add(View x) + { + NDalicPINVOKE.ActorContainer_Add(swigCPtr, View.getCPtr(x)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + private uint size() + { + uint ret = NDalicPINVOKE.ActorContainer_size(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + private uint capacity() + { + uint ret = NDalicPINVOKE.ActorContainer_capacity(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + private void reserve(uint n) + { + NDalicPINVOKE.ActorContainer_reserve(swigCPtr, n); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public ViewContainer() : this(NDalicPINVOKE.new_ActorContainer__SWIG_0(), true) + { + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public ViewContainer(ViewContainer other) : this(NDalicPINVOKE.new_ActorContainer__SWIG_1(ViewContainer.getCPtr(other)), true) + { + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public ViewContainer(int capacity) : this(NDalicPINVOKE.new_ActorContainer__SWIG_2(capacity), true) + { + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + 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 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, View val) + { + NDalicPINVOKE.ActorContainer_setitem(swigCPtr, index, View.getCPtr(val)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public void AddRange(ViewContainer values) + { + NDalicPINVOKE.ActorContainer_AddRange(swigCPtr, ViewContainer.getCPtr(values)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public ViewContainer GetRange(int index, int count) + { + global::System.IntPtr cPtr = NDalicPINVOKE.ActorContainer_GetRange(swigCPtr, index, count); + 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, View x) + { + NDalicPINVOKE.ActorContainer_Insert(swigCPtr, index, View.getCPtr(x)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public void InsertRange(int index, ViewContainer values) + { + NDalicPINVOKE.ActorContainer_InsertRange(swigCPtr, index, ViewContainer.getCPtr(values)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public void RemoveAt(int index) + { + NDalicPINVOKE.ActorContainer_RemoveAt(swigCPtr, index); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public void RemoveRange(int index, int count) + { + NDalicPINVOKE.ActorContainer_RemoveRange(swigCPtr, index, count); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + 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; + } + + public void Reverse() + { + NDalicPINVOKE.ActorContainer_Reverse__SWIG_0(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + public void Reverse(int index, int count) + { + NDalicPINVOKE.ActorContainer_Reverse__SWIG_1(swigCPtr, index, count); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + 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 2037049..1cb651b 100755 --- a/src/Tizen.NUI/src/internal/ViewImpl.cs +++ b/src/Tizen.NUI/src/internal/ViewImpl.cs @@ -17,7 +17,7 @@ using Tizen.NUI.BaseComponents; namespace Tizen.NUI { - internal class ViewImpl : CustomActorImpl + public class ViewImpl : CustomActorImpl { private global::System.Runtime.InteropServices.HandleRef swigCPtr; diff --git a/src/Tizen.NUI/src/internal/ViewResourceReadySignal.cs b/src/Tizen.NUI/src/internal/ViewResourceReadySignal.cs index 2021250..ae5615e 100755 --- a/src/Tizen.NUI/src/internal/ViewResourceReadySignal.cs +++ b/src/Tizen.NUI/src/internal/ViewResourceReadySignal.cs @@ -12,7 +12,7 @@ using Tizen.NUI.BaseComponents; namespace Tizen.NUI { - internal class ViewResourceReadySignal : global::System.IDisposable + public class ViewResourceReadySignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/src/Tizen.NUI/src/internal/ViewSignal.cs b/src/Tizen.NUI/src/internal/ViewSignal.cs index 05f5033..5650c9f 100755 --- a/src/Tizen.NUI/src/internal/ViewSignal.cs +++ b/src/Tizen.NUI/src/internal/ViewSignal.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { using Tizen.NUI.BaseComponents; - internal class ViewSignal : global::System.IDisposable + public class ViewSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/src/Tizen.NUI/src/internal/ViewVisibilityChangedSignal.cs b/src/Tizen.NUI/src/internal/ViewVisibilityChangedSignal.cs index 7cb00da..4c60fc9 100755 --- a/src/Tizen.NUI/src/internal/ViewVisibilityChangedSignal.cs +++ b/src/Tizen.NUI/src/internal/ViewVisibilityChangedSignal.cs @@ -11,7 +11,7 @@ using Tizen.NUI.BaseComponents; namespace Tizen.NUI { - internal class ViewVisibilityChangedSignal : global::System.IDisposable + public class ViewVisibilityChangedSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/src/Tizen.NUI/src/internal/ViewWrapper.cs b/src/Tizen.NUI/src/internal/ViewWrapper.cs index 8293e87..a78da9b 100755 --- a/src/Tizen.NUI/src/internal/ViewWrapper.cs +++ b/src/Tizen.NUI/src/internal/ViewWrapper.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -22,7 +22,7 @@ namespace Tizen.NUI public class ViewWrapper : View { private global::System.Runtime.InteropServices.HandleRef swigCPtr; - internal ViewWrapperImpl viewWrapperImpl; + protected ViewWrapperImpl viewWrapperImpl; internal ViewWrapper(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicManualPINVOKE.ViewWrapper_SWIGUpcast(cPtr), cMemoryOwn) { @@ -72,7 +72,7 @@ namespace Tizen.NUI } - internal ViewWrapper(string typeName, ViewWrapperImpl implementation) : this(NDalicManualPINVOKE.ViewWrapper_New(typeName, ViewWrapperImpl.getCPtr(implementation)), true) + public ViewWrapper(string typeName, ViewWrapperImpl implementation) : this(NDalicManualPINVOKE.ViewWrapper_New(typeName, ViewWrapperImpl.getCPtr(implementation)), true) { viewWrapperImpl = implementation; if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/src/Tizen.NUI/src/internal/ViewWrapperImpl.cs b/src/Tizen.NUI/src/internal/ViewWrapperImpl.cs index 14ce6ec..61ea3ca 100755 --- a/src/Tizen.NUI/src/internal/ViewWrapperImpl.cs +++ b/src/Tizen.NUI/src/internal/ViewWrapperImpl.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -17,7 +17,7 @@ using Tizen.NUI.BaseComponents; namespace Tizen.NUI { - internal sealed class ViewWrapperImpl : ViewImpl + public sealed class ViewWrapperImpl : ViewImpl { private global::System.Runtime.InteropServices.HandleRef swigCPtr; public delegate void OnStageConnectionDelegate(int depth); diff --git a/src/Tizen.NUI/src/public/BaseComponents/VisibilityChangeType.cs b/src/Tizen.NUI/src/internal/VisibilityChangeType.cs similarity index 100% rename from src/Tizen.NUI/src/public/BaseComponents/VisibilityChangeType.cs rename to src/Tizen.NUI/src/internal/VisibilityChangeType.cs diff --git a/src/Tizen.NUI/src/internal/VoidSignal.cs b/src/Tizen.NUI/src/internal/VoidSignal.cs index 6cf2c0c..d813a25 100755 --- a/src/Tizen.NUI/src/internal/VoidSignal.cs +++ b/src/Tizen.NUI/src/internal/VoidSignal.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - internal class VoidSignal : global::System.IDisposable + public class VoidSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/src/Tizen.NUI/src/internal/WindowFocusSignalType.cs b/src/Tizen.NUI/src/internal/WindowFocusSignalType.cs index 5190fa0..6f1560d 100755 --- a/src/Tizen.NUI/src/internal/WindowFocusSignalType.cs +++ b/src/Tizen.NUI/src/internal/WindowFocusSignalType.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - internal class WindowFocusSignalType : global::System.IDisposable + public class WindowFocusSignalType : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/src/Tizen.NUI/src/public/BaseComponents/View.cs b/src/Tizen.NUI/src/public/BaseComponents/View.cs index 9ea3d8f..082a9f5 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/View.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/View.cs @@ -2293,6 +2293,14 @@ namespace Tizen.NUI.BaseComponents 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); diff --git a/src/Tizen.NUI/src/public/NUIConstants.cs b/src/Tizen.NUI/src/public/NUIConstants.cs index b586387..a2edc24 100755 --- a/src/Tizen.NUI/src/public/NUIConstants.cs +++ b/src/Tizen.NUI/src/public/NUIConstants.cs @@ -15,16 +15,6 @@ using System.ComponentModel; namespace Tizen.NUI { - public enum ScrollModeType - { - XAxisScrollEnabled, - XAxisSnapToInterval, - XAxisScrollBoundary, - YAxisScrollEnabled, - YAxisSnapToInterval, - YAxisScrollBoundary - } - /// /// This specifies whether the Actor uses its own color, or inherits. /// diff --git a/src/Tizen.NUI/src/public/TableView.cs b/src/Tizen.NUI/src/public/TableView.cs index 63273a7..f45d8b5 100755 --- a/src/Tizen.NUI/src/public/TableView.cs +++ b/src/Tizen.NUI/src/public/TableView.cs @@ -597,6 +597,12 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } + internal void DeleteRow(uint rowIndex, ViewContainer removed) + { + NDalicPINVOKE.TableView_DeleteRow__SWIG_1(swigCPtr, rowIndex, ViewContainer.getCPtr(removed)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + /// /// Inserts a new column to the given index. /// @@ -618,6 +624,12 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } + internal void DeleteColumn(uint columnIndex, ViewContainer removed) + { + NDalicPINVOKE.TableView_DeleteColumn__SWIG_1(swigCPtr, columnIndex, ViewContainer.getCPtr(removed)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + /// /// Resizes the TableView. /// @@ -629,6 +641,12 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } + internal void Resize(uint rows, uint columns, ViewContainer removed) + { + NDalicPINVOKE.TableView_Resize__SWIG_1(swigCPtr, rows, columns, ViewContainer.getCPtr(removed)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + /// /// Sets horizontal and vertical padding between cells. /// diff --git a/src/Tizen.NUI/src/public/UIComponents/ScrollBar.cs b/src/Tizen.NUI/src/public/UIComponents/ScrollBar.cs index 7b4f6b5..4236141 100755 --- a/src/Tizen.NUI/src/public/UIComponents/ScrollBar.cs +++ b/src/Tizen.NUI/src/public/UIComponents/ScrollBar.cs @@ -359,6 +359,19 @@ namespace Tizen.NUI.UIComponents return ret; } + internal void SetScrollPositionIntervals(VectorFloat positions) + { + NDalicPINVOKE.ScrollBar_SetScrollPositionIntervals(swigCPtr, VectorFloat.getCPtr(positions)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal VectorFloat GetScrollPositionIntervals() + { + VectorFloat ret = new VectorFloat(NDalicPINVOKE.ScrollBar_GetScrollPositionIntervals(swigCPtr), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + internal void SetScrollDirection(ScrollBar.Direction direction) { NDalicPINVOKE.ScrollBar_SetScrollDirection(swigCPtr, (int)direction); -- 2.7.4