From ced84f46cc41eaf18786f8e3ff1b5de9edf5d953 Mon Sep 17 00:00:00 2001 From: Umar Date: Wed, 24 May 2017 17:57:03 +0100 Subject: [PATCH] merging dali-sharp class scope with nui Change-Id: I892558c03a05123c9c62923614a05606e55e554e --- .../NUISamples.TizenTV/examples/scroll-view.cs | 14 +- src/Tizen.NUI/src/internal/AlignType.cs | 27 -- src/Tizen.NUI/src/internal/Builder.cs | 2 +- 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/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 +- .../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/Tizen.NUI/src/internal/PanGestureDetector.cs | 2 +- src/Tizen.NUI/src/internal/PinchGestureDetector.cs | 2 +- .../src/internal/PositionInheritanceMode.cs | 22 -- ...ocusChangeSignal.cs => PreFocusChangeSignal.cs} | 2 +- .../src/internal/ProgressBarValueChangedSignal.cs | 2 +- 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 +- src/Tizen.NUI/src/internal/SignalObserver.cs | 2 +- src/Tizen.NUI/src/internal/Slider.cs | 2 +- src/Tizen.NUI/src/internal/SlotObserver.cs | 2 +- src/Tizen.NUI/src/internal/TapGestureDetector.cs | 2 +- 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 +- src/Tizen.NUI/src/internal/VoidSignal.cs | 2 +- .../src/internal/WindowFocusSignalType.cs | 2 +- .../src/{internal => public}/Animatable.cs | 6 - src/Tizen.NUI/src/public/BaseComponents/View.cs | 8 - .../BaseComponents}/VisibilityChangeType.cs | 0 .../src/{internal => public}/BaseHandle.cs | 0 .../src/{internal => public}/DirectionBias.cs | 0 .../{internal => public}/KeyInputFocusManager.cs | 0 src/Tizen.NUI/src/public/NUIConstants.cs | 10 + .../src/{internal => public}/PaddingType.cs | 0 .../src/{internal => public}/ProgressBar.cs | 0 .../src/{internal => public}/ScrollViewEffect.cs | 0 .../src/{internal => public}/Scrollable.cs | 0 src/Tizen.NUI/src/{internal => public}/Size.cs | 0 src/Tizen.NUI/src/public/TableView.cs | 18 - .../src/{internal => public}/TransitionData.cs | 0 .../{internal => public/UIComponents}/Button.cs | 0 .../src/{internal => public/UIComponents}/Popup.cs | 0 .../UIComponents}/RadioButton.cs | 0 src/Tizen.NUI/src/public/UIComponents/ScrollBar.cs | 13 - .../UIComponents}/ScrollView.cs | 74 +--- .../UIComponents}/ToggleButton.cs | 0 79 files changed, 85 insertions(+), 1303 deletions(-) delete mode 100644 src/Tizen.NUI/src/internal/AlignType.cs delete mode 100755 src/Tizen.NUI/src/internal/ClampState.cs delete mode 100755 src/Tizen.NUI/src/internal/ClampState2D.cs delete mode 100755 src/Tizen.NUI/src/internal/ControlOrientationType.cs delete mode 100755 src/Tizen.NUI/src/internal/Meta.cs delete mode 100755 src/Tizen.NUI/src/internal/PositionInheritanceMode.cs rename src/Tizen.NUI/src/internal/{KeyboardPreFocusChangeSignal.cs => PreFocusChangeSignal.cs} (99%) delete mode 100755 src/Tizen.NUI/src/internal/VectorFloat.cs delete mode 100755 src/Tizen.NUI/src/internal/VectorInteger.cs delete mode 100755 src/Tizen.NUI/src/internal/ViewContainer.cs rename src/Tizen.NUI/src/{internal => public}/Animatable.cs (96%) rename src/Tizen.NUI/src/{internal => public/BaseComponents}/VisibilityChangeType.cs (100%) rename src/Tizen.NUI/src/{internal => public}/BaseHandle.cs (100%) rename src/Tizen.NUI/src/{internal => public}/DirectionBias.cs (100%) rename src/Tizen.NUI/src/{internal => public}/KeyInputFocusManager.cs (100%) rename src/Tizen.NUI/src/{internal => public}/PaddingType.cs (100%) rename src/Tizen.NUI/src/{internal => public}/ProgressBar.cs (100%) rename src/Tizen.NUI/src/{internal => public}/ScrollViewEffect.cs (100%) rename src/Tizen.NUI/src/{internal => public}/Scrollable.cs (100%) rename src/Tizen.NUI/src/{internal => public}/Size.cs (100%) rename src/Tizen.NUI/src/{internal => public}/TransitionData.cs (100%) rename src/Tizen.NUI/src/{internal => public/UIComponents}/Button.cs (100%) rename src/Tizen.NUI/src/{internal => public/UIComponents}/Popup.cs (100%) rename src/Tizen.NUI/src/{internal => public/UIComponents}/RadioButton.cs (100%) rename src/Tizen.NUI/src/{internal => public/UIComponents}/ScrollView.cs (94%) rename src/Tizen.NUI/src/{internal => public/UIComponents}/ToggleButton.cs (100%) diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/scroll-view.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/scroll-view.cs index 7323297..a93b762 100644 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/scroll-view.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/scroll-view.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * 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. @@ -118,12 +118,12 @@ namespace ScrollViewTest // Set scroll view to have 3 pages in X axis and allow page snapping, // and also disable scrolling in Y axis. - RulerPtr scrollRulerX = new RulerPtr(new FixedRuler(windowSize.Width)); - RulerPtr scrollRulerY = new RulerPtr(new DefaultRuler()); - scrollRulerX.SetDomain(new RulerDomain(0.0f, windowSize.Width * pageColumns, true)); - scrollRulerY.Disable(); - _scrollView.SetRulerX(scrollRulerX); - _scrollView.SetRulerY(scrollRulerY); + PropertyMap rulerMap = new PropertyMap(); + rulerMap.Add((int)ScrollModeType.XAxisScrollEnabled, new PropertyValue(true)); + rulerMap.Add((int)ScrollModeType.XAxisSnapToInterval, new PropertyValue(windowSize.Width)); + rulerMap.Add((int)ScrollModeType.XAxisScrollBoundary, new PropertyValue(windowSize.Width * pageColumns ) ); + rulerMap.Add((int)ScrollModeType.YAxisScrollEnabled, new PropertyValue( false ) ); + _scrollView.ScrollMode = rulerMap; // Create a horizontal scroll bar in the bottom of scroll view (which is optional) _scrollBar = new ScrollBar(ScrollBar.Direction.Horizontal); diff --git a/src/Tizen.NUI/src/internal/AlignType.cs b/src/Tizen.NUI/src/internal/AlignType.cs deleted file mode 100644 index c1537eb..0000000 --- a/src/Tizen.NUI/src/internal/AlignType.cs +++ /dev/null @@ -1,27 +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 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/internal/Builder.cs b/src/Tizen.NUI/src/internal/Builder.cs index 6e5a521..0001b89 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; - public class Builder : BaseHandle + internal class Builder : BaseHandle { private global::System.Runtime.InteropServices.HandleRef swigCPtr; diff --git a/src/Tizen.NUI/src/internal/Camera.cs b/src/Tizen.NUI/src/internal/Camera.cs index 26dbf69..b7fe34d 100755 --- a/src/Tizen.NUI/src/internal/Camera.cs +++ b/src/Tizen.NUI/src/internal/Camera.cs @@ -27,7 +27,7 @@ namespace Tizen.NUI { - public class Camera : Animatable + internal 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 deleted file mode 100755 index bcb760a..0000000 --- a/src/Tizen.NUI/src/internal/ClampState.cs +++ /dev/null @@ -1,21 +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 -{ - - internal enum ClampState - { - NotClamped, - ClampedToMin, - ClampedToMax - } - -} diff --git a/src/Tizen.NUI/src/internal/ClampState2D.cs b/src/Tizen.NUI/src/internal/ClampState2D.cs deleted file mode 100755 index 1ebf1ba..0000000 --- a/src/Tizen.NUI/src/internal/ClampState2D.cs +++ /dev/null @@ -1,139 +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 -{ - - 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 c8f952e..20ffdf2 100755 --- a/src/Tizen.NUI/src/internal/ConnectionTrackerInterface.cs +++ b/src/Tizen.NUI/src/internal/ConnectionTrackerInterface.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - public class ConnectionTrackerInterface : SignalObserver + internal 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 deleted file mode 100755 index 6fac6b7..0000000 --- a/src/Tizen.NUI/src/internal/ControlOrientationType.cs +++ /dev/null @@ -1,22 +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 -{ - - 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 27b1dde..b0f8ef0 100755 --- a/src/Tizen.NUI/src/internal/CustomActor.cs +++ b/src/Tizen.NUI/src/internal/CustomActor.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - public class CustomActor : Animatable + internal 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 4bdf93e..acdf68e 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; - public class CustomActorImpl : RefObject + internal 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 1ab2697..9aaa725 100755 --- a/src/Tizen.NUI/src/internal/DefaultItemLayoutProperty.cs +++ b/src/Tizen.NUI/src/internal/DefaultItemLayoutProperty.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - public enum DefaultItemLayoutProperty + internal 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 18f06dc..216b5b6 100755 --- a/src/Tizen.NUI/src/internal/DefaultItemLayoutType.cs +++ b/src/Tizen.NUI/src/internal/DefaultItemLayoutType.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - public enum DefaultItemLayoutType + internal enum DefaultItemLayoutType { DEPTH, GRID, diff --git a/src/Tizen.NUI/src/internal/DefaultRuler.cs b/src/Tizen.NUI/src/internal/DefaultRuler.cs index dfb5163..b66e54e 100755 --- a/src/Tizen.NUI/src/internal/DefaultRuler.cs +++ b/src/Tizen.NUI/src/internal/DefaultRuler.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - public class DefaultRuler : Ruler + internal class DefaultRuler : Ruler { private global::System.Runtime.InteropServices.HandleRef swigCPtr; diff --git a/src/Tizen.NUI/src/internal/EventThreadCallback.cs b/src/Tizen.NUI/src/internal/EventThreadCallback.cs index c234de8..d8c5b1a 100755 --- a/src/Tizen.NUI/src/internal/EventThreadCallback.cs +++ b/src/Tizen.NUI/src/internal/EventThreadCallback.cs @@ -18,7 +18,7 @@ namespace Tizen.NUI { - public class EventThreadCallback : global::System.IDisposable + internal 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 eddb0d5..56f9b8d 100755 --- a/src/Tizen.NUI/src/internal/FixedRuler.cs +++ b/src/Tizen.NUI/src/internal/FixedRuler.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - public class FixedRuler : Ruler + internal 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 28f84bf..16e1c6f 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; - public class GestureDetector : BaseHandle + internal 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 32022ea..f19261d 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; - public class Item : global::System.IDisposable + internal 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 e6d59f5..b8ce824 100755 --- a/src/Tizen.NUI/src/internal/ItemContainer.cs +++ b/src/Tizen.NUI/src/internal/ItemContainer.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - public class ItemContainer : global::System.IDisposable, global::System.Collections.IEnumerable + internal 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 c319f7f..dc841db 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; - public class ItemFactory : global::System.IDisposable + internal 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 d21e712..5e6fc76 100755 --- a/src/Tizen.NUI/src/internal/ItemIdContainer.cs +++ b/src/Tizen.NUI/src/internal/ItemIdContainer.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - public class ItemIdContainer : global::System.IDisposable, global::System.Collections.IEnumerable + internal 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 2bd2374..53af640 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 { - public class ItemLayout : RefObject + internal class ItemLayout : RefObject { private global::System.Runtime.InteropServices.HandleRef swigCPtr; @@ -59,18 +59,6 @@ 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 9fe58c4..0ccd36d 100755 --- a/src/Tizen.NUI/src/internal/ItemRange.cs +++ b/src/Tizen.NUI/src/internal/ItemRange.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - public class ItemRange : global::System.IDisposable + internal 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 b29dd55..85728d1 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; - public class ItemView : Scrollable + internal class ItemView : Scrollable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; diff --git a/src/Tizen.NUI/src/internal/LongPressGestureDetector.cs b/src/Tizen.NUI/src/internal/LongPressGestureDetector.cs index 1a31ed3..4977c03 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; - public class LongPressGestureDetector : GestureDetector + internal 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 deleted file mode 100755 index 6fb90b3..0000000 --- a/src/Tizen.NUI/src/internal/Meta.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 -{ - - 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 132fb2d..cb47707 100755 --- a/src/Tizen.NUI/src/internal/NDalic.cs +++ b/src/Tizen.NUI/src/internal/NDalic.cs @@ -502,13 +502,6 @@ 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 @@ -1300,19 +1293,6 @@ 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 6268803..46c5a6a 100755 --- a/src/Tizen.NUI/src/internal/NDalicPINVOKE.cs +++ b/src/Tizen.NUI/src/internal/NDalicPINVOKE.cs @@ -8418,6 +8418,9 @@ 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 37f15ec..b59f3c2 100755 --- a/src/Tizen.NUI/src/internal/Object.cs +++ b/src/Tizen.NUI/src/internal/Object.cs @@ -22,7 +22,7 @@ namespace Tizen.NUI { - public static class Object + internal static class Object { public static PropertyValue GetProperty(global::System.Runtime.InteropServices.HandleRef handle, int index) { diff --git a/src/Tizen.NUI/src/internal/PanGestureDetector.cs b/src/Tizen.NUI/src/internal/PanGestureDetector.cs index 7217c17..aa8d049 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; - public class PanGestureDetector : GestureDetector + internal 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 566e0f9..fc81c72 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; - public class PinchGestureDetector : GestureDetector + internal class PinchGestureDetector : GestureDetector { private global::System.Runtime.InteropServices.HandleRef swigCPtr; diff --git a/src/Tizen.NUI/src/internal/PositionInheritanceMode.cs b/src/Tizen.NUI/src/internal/PositionInheritanceMode.cs deleted file mode 100755 index a04a2e4..0000000 --- a/src/Tizen.NUI/src/internal/PositionInheritanceMode.cs +++ /dev/null @@ -1,22 +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 -{ - - 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/internal/KeyboardPreFocusChangeSignal.cs b/src/Tizen.NUI/src/internal/PreFocusChangeSignal.cs similarity index 99% rename from src/Tizen.NUI/src/internal/KeyboardPreFocusChangeSignal.cs rename to src/Tizen.NUI/src/internal/PreFocusChangeSignal.cs index bef6ed1..78799a7 100755 --- a/src/Tizen.NUI/src/internal/KeyboardPreFocusChangeSignal.cs +++ b/src/Tizen.NUI/src/internal/PreFocusChangeSignal.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * 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. diff --git a/src/Tizen.NUI/src/internal/ProgressBarValueChangedSignal.cs b/src/Tizen.NUI/src/internal/ProgressBarValueChangedSignal.cs index 1c6fc85..e84de67 100755 --- a/src/Tizen.NUI/src/internal/ProgressBarValueChangedSignal.cs +++ b/src/Tizen.NUI/src/internal/ProgressBarValueChangedSignal.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - public class ProgressBarValueChangedSignal : global::System.IDisposable + internal class ProgressBarValueChangedSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/src/Tizen.NUI/src/internal/RefObject.cs b/src/Tizen.NUI/src/internal/RefObject.cs index e46c92e..4f5c79a 100755 --- a/src/Tizen.NUI/src/internal/RefObject.cs +++ b/src/Tizen.NUI/src/internal/RefObject.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - public class RefObject : global::System.IDisposable + internal 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 fc1b960..5b87186 100755 --- a/src/Tizen.NUI/src/internal/Ruler.cs +++ b/src/Tizen.NUI/src/internal/Ruler.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - public class Ruler : RefObject + internal 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 cbe2b4b..18b8609 100755 --- a/src/Tizen.NUI/src/internal/RulerDomain.cs +++ b/src/Tizen.NUI/src/internal/RulerDomain.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - public class RulerDomain : global::System.IDisposable + internal 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 2ab91cf..8f660dc 100755 --- a/src/Tizen.NUI/src/internal/RulerPtr.cs +++ b/src/Tizen.NUI/src/internal/RulerPtr.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - public class RulerPtr : global::System.IDisposable + internal 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 1f7ceab..0191095 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 { - public class SWIGTYPE_p_CallbackBase + internal 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 9acac7f..22ff2b9 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 { - public class SWIGTYPE_p_Dali__CallbackBase + internal 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 1af9222..1e123d8 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 { - public class SWIGTYPE_p_Dali__FunctorDelegate + internal 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 e16bc39..3fbcf72 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 { - public class SWIGTYPE_p_Dali__Internal__Texture + internal 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 5490134..b6a2520 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 { - public class SWIGTYPE_p_Dali__IntrusivePtrT_Dali__Toolkit__ItemLayout_t + internal 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 0ca2c39..f07cda2 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 { - public class SWIGTYPE_p_Dali__SignalT_void_fDali__Actor_bool_Dali__DevelActor__VisibilityChange__TypeF_t + internal 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/internal/SignalObserver.cs b/src/Tizen.NUI/src/internal/SignalObserver.cs index 1eb0b2e..3f2bbfb 100755 --- a/src/Tizen.NUI/src/internal/SignalObserver.cs +++ b/src/Tizen.NUI/src/internal/SignalObserver.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - public class SignalObserver : global::System.IDisposable + internal class SignalObserver : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/src/Tizen.NUI/src/internal/Slider.cs b/src/Tizen.NUI/src/internal/Slider.cs index 6f4e930..5ab6157 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. /// - public class Slider : View + internal 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 a5fdab1..a75a4ea 100755 --- a/src/Tizen.NUI/src/internal/SlotObserver.cs +++ b/src/Tizen.NUI/src/internal/SlotObserver.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - public class SlotObserver : global::System.IDisposable + internal 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 0390e45..ded1004 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; - public class TapGestureDetector : GestureDetector + internal class TapGestureDetector : GestureDetector { private global::System.Runtime.InteropServices.HandleRef swigCPtr; diff --git a/src/Tizen.NUI/src/internal/TypeInfo.cs b/src/Tizen.NUI/src/internal/TypeInfo.cs index 44196e9..2107cd3 100755 --- a/src/Tizen.NUI/src/internal/TypeInfo.cs +++ b/src/Tizen.NUI/src/internal/TypeInfo.cs @@ -131,12 +131,6 @@ 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 deleted file mode 100755 index 1b35b38..0000000 --- a/src/Tizen.NUI/src/internal/VectorFloat.cs +++ /dev/null @@ -1,216 +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 -{ - - 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 deleted file mode 100755 index de342c0..0000000 --- a/src/Tizen.NUI/src/internal/VectorInteger.cs +++ /dev/null @@ -1,218 +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 -{ - - 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 deleted file mode 100755 index 8f1e23b..0000000 --- a/src/Tizen.NUI/src/internal/ViewContainer.cs +++ /dev/null @@ -1,422 +0,0 @@ -//------------------------------------------------------------------------------ -// -// -// 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 1cb651b..2037049 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 { - public class ViewImpl : CustomActorImpl + internal 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 ae5615e..2021250 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 { - public class ViewResourceReadySignal : global::System.IDisposable + internal 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 5650c9f..05f5033 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; - public class ViewSignal : global::System.IDisposable + internal 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 4c60fc9..7cb00da 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 { - public class ViewVisibilityChangedSignal : global::System.IDisposable + internal 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 a78da9b..8293e87 100755 --- a/src/Tizen.NUI/src/internal/ViewWrapper.cs +++ b/src/Tizen.NUI/src/internal/ViewWrapper.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * 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. @@ -22,7 +22,7 @@ namespace Tizen.NUI public class ViewWrapper : View { private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected ViewWrapperImpl viewWrapperImpl; + internal ViewWrapperImpl viewWrapperImpl; internal ViewWrapper(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicManualPINVOKE.ViewWrapper_SWIGUpcast(cPtr), cMemoryOwn) { @@ -72,7 +72,7 @@ namespace Tizen.NUI } - public ViewWrapper(string typeName, ViewWrapperImpl implementation) : this(NDalicManualPINVOKE.ViewWrapper_New(typeName, ViewWrapperImpl.getCPtr(implementation)), true) + internal 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 61ea3ca..14ce6ec 100755 --- a/src/Tizen.NUI/src/internal/ViewWrapperImpl.cs +++ b/src/Tizen.NUI/src/internal/ViewWrapperImpl.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * 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. @@ -17,7 +17,7 @@ using Tizen.NUI.BaseComponents; namespace Tizen.NUI { - public sealed class ViewWrapperImpl : ViewImpl + internal sealed class ViewWrapperImpl : ViewImpl { private global::System.Runtime.InteropServices.HandleRef swigCPtr; public delegate void OnStageConnectionDelegate(int depth); diff --git a/src/Tizen.NUI/src/internal/VoidSignal.cs b/src/Tizen.NUI/src/internal/VoidSignal.cs index d813a25..6cf2c0c 100755 --- a/src/Tizen.NUI/src/internal/VoidSignal.cs +++ b/src/Tizen.NUI/src/internal/VoidSignal.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - public class VoidSignal : global::System.IDisposable + internal 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 6f1560d..5190fa0 100755 --- a/src/Tizen.NUI/src/internal/WindowFocusSignalType.cs +++ b/src/Tizen.NUI/src/internal/WindowFocusSignalType.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - public class WindowFocusSignalType : global::System.IDisposable + internal class WindowFocusSignalType : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/src/Tizen.NUI/src/internal/Animatable.cs b/src/Tizen.NUI/src/public/Animatable.cs similarity index 96% rename from src/Tizen.NUI/src/internal/Animatable.cs rename to src/Tizen.NUI/src/public/Animatable.cs index 7e5ee28..d02e57d 100755 --- a/src/Tizen.NUI/src/internal/Animatable.cs +++ b/src/Tizen.NUI/src/public/Animatable.cs @@ -155,12 +155,6 @@ 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/BaseComponents/View.cs b/src/Tizen.NUI/src/public/BaseComponents/View.cs index 4e735f5..63fcb44 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/View.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/View.cs @@ -2280,14 +2280,6 @@ 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/internal/VisibilityChangeType.cs b/src/Tizen.NUI/src/public/BaseComponents/VisibilityChangeType.cs similarity index 100% rename from src/Tizen.NUI/src/internal/VisibilityChangeType.cs rename to src/Tizen.NUI/src/public/BaseComponents/VisibilityChangeType.cs diff --git a/src/Tizen.NUI/src/internal/BaseHandle.cs b/src/Tizen.NUI/src/public/BaseHandle.cs similarity index 100% rename from src/Tizen.NUI/src/internal/BaseHandle.cs rename to src/Tizen.NUI/src/public/BaseHandle.cs diff --git a/src/Tizen.NUI/src/internal/DirectionBias.cs b/src/Tizen.NUI/src/public/DirectionBias.cs similarity index 100% rename from src/Tizen.NUI/src/internal/DirectionBias.cs rename to src/Tizen.NUI/src/public/DirectionBias.cs diff --git a/src/Tizen.NUI/src/internal/KeyInputFocusManager.cs b/src/Tizen.NUI/src/public/KeyInputFocusManager.cs similarity index 100% rename from src/Tizen.NUI/src/internal/KeyInputFocusManager.cs rename to src/Tizen.NUI/src/public/KeyInputFocusManager.cs diff --git a/src/Tizen.NUI/src/public/NUIConstants.cs b/src/Tizen.NUI/src/public/NUIConstants.cs index a2edc24..b586387 100755 --- a/src/Tizen.NUI/src/public/NUIConstants.cs +++ b/src/Tizen.NUI/src/public/NUIConstants.cs @@ -15,6 +15,16 @@ 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/internal/PaddingType.cs b/src/Tizen.NUI/src/public/PaddingType.cs similarity index 100% rename from src/Tizen.NUI/src/internal/PaddingType.cs rename to src/Tizen.NUI/src/public/PaddingType.cs diff --git a/src/Tizen.NUI/src/internal/ProgressBar.cs b/src/Tizen.NUI/src/public/ProgressBar.cs similarity index 100% rename from src/Tizen.NUI/src/internal/ProgressBar.cs rename to src/Tizen.NUI/src/public/ProgressBar.cs diff --git a/src/Tizen.NUI/src/internal/ScrollViewEffect.cs b/src/Tizen.NUI/src/public/ScrollViewEffect.cs similarity index 100% rename from src/Tizen.NUI/src/internal/ScrollViewEffect.cs rename to src/Tizen.NUI/src/public/ScrollViewEffect.cs diff --git a/src/Tizen.NUI/src/internal/Scrollable.cs b/src/Tizen.NUI/src/public/Scrollable.cs similarity index 100% rename from src/Tizen.NUI/src/internal/Scrollable.cs rename to src/Tizen.NUI/src/public/Scrollable.cs diff --git a/src/Tizen.NUI/src/internal/Size.cs b/src/Tizen.NUI/src/public/Size.cs similarity index 100% rename from src/Tizen.NUI/src/internal/Size.cs rename to src/Tizen.NUI/src/public/Size.cs diff --git a/src/Tizen.NUI/src/public/TableView.cs b/src/Tizen.NUI/src/public/TableView.cs index f45d8b5..63273a7 100755 --- a/src/Tizen.NUI/src/public/TableView.cs +++ b/src/Tizen.NUI/src/public/TableView.cs @@ -597,12 +597,6 @@ 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. /// @@ -624,12 +618,6 @@ 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. /// @@ -641,12 +629,6 @@ 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/internal/TransitionData.cs b/src/Tizen.NUI/src/public/TransitionData.cs similarity index 100% rename from src/Tizen.NUI/src/internal/TransitionData.cs rename to src/Tizen.NUI/src/public/TransitionData.cs diff --git a/src/Tizen.NUI/src/internal/Button.cs b/src/Tizen.NUI/src/public/UIComponents/Button.cs similarity index 100% rename from src/Tizen.NUI/src/internal/Button.cs rename to src/Tizen.NUI/src/public/UIComponents/Button.cs diff --git a/src/Tizen.NUI/src/internal/Popup.cs b/src/Tizen.NUI/src/public/UIComponents/Popup.cs similarity index 100% rename from src/Tizen.NUI/src/internal/Popup.cs rename to src/Tizen.NUI/src/public/UIComponents/Popup.cs diff --git a/src/Tizen.NUI/src/internal/RadioButton.cs b/src/Tizen.NUI/src/public/UIComponents/RadioButton.cs similarity index 100% rename from src/Tizen.NUI/src/internal/RadioButton.cs rename to src/Tizen.NUI/src/public/UIComponents/RadioButton.cs diff --git a/src/Tizen.NUI/src/public/UIComponents/ScrollBar.cs b/src/Tizen.NUI/src/public/UIComponents/ScrollBar.cs index 4236141..7b4f6b5 100755 --- a/src/Tizen.NUI/src/public/UIComponents/ScrollBar.cs +++ b/src/Tizen.NUI/src/public/UIComponents/ScrollBar.cs @@ -359,19 +359,6 @@ 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); diff --git a/src/Tizen.NUI/src/internal/ScrollView.cs b/src/Tizen.NUI/src/public/UIComponents/ScrollView.cs similarity index 94% rename from src/Tizen.NUI/src/internal/ScrollView.cs rename to src/Tizen.NUI/src/public/UIComponents/ScrollView.cs index f97eb60..9fd9ae8 100755 --- a/src/Tizen.NUI/src/internal/ScrollView.cs +++ b/src/Tizen.NUI/src/public/UIComponents/ScrollView.cs @@ -246,53 +246,6 @@ 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(); @@ -533,6 +486,7 @@ 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(); @@ -633,17 +587,6 @@ 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) { @@ -1176,6 +1119,21 @@ 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/internal/ToggleButton.cs b/src/Tizen.NUI/src/public/UIComponents/ToggleButton.cs similarity index 100% rename from src/Tizen.NUI/src/internal/ToggleButton.cs rename to src/Tizen.NUI/src/public/UIComponents/ToggleButton.cs -- 2.7.4