From: dongsug-song <35130733+dongsug-song@users.noreply.github.com>
Date: Mon, 12 Aug 2019 11:16:12 +0000 (+0900)
Subject: [NUI] Sync with dalihub (#970)
X-Git-Tag: 5.5_M2~118
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8ac523e86dbba7f31a758d8fdab5319fad42a442;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git
[NUI] Sync with dalihub (#970)
---
diff --git a/src/Tizen.NUI/src/internal/DefaultItemLayoutProperty.cs b/src/Tizen.NUI/src/internal/DefaultItemLayoutProperty.cs
index 1460198..6fe2cfe 100755
--- a/src/Tizen.NUI/src/internal/DefaultItemLayoutProperty.cs
+++ b/src/Tizen.NUI/src/internal/DefaultItemLayoutProperty.cs
@@ -24,31 +24,160 @@ namespace Tizen.NUI
[EditorBrowsable(EditorBrowsableState.Never)]
public enum DefaultItemLayoutProperty
{
+ ///
+ /// The type of the Layout.
+ ///
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
TYPE = 0,
+
+ ///
+ /// The size of each item in the Layout.
+ ///
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
ITEM_SIZE,
+
+ ///
+ /// The internal orientation of the Layout.
+ ///
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
ORIENTATION,
+
+ ///
+ /// The number of columns in the GridLayout.
+ ///
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
GRID_COLUMN_NUMBER,
+
+ ///
+ /// The spacing between rows in the GridLayout.
+ ///
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
GRID_ROW_SPACING,
+
+ ///
+ /// The spacing between columns in the GridLayout.
+ ///
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
GRID_COLUMN_SPACING,
+
+ ///
+ /// The margin in the top of the GridLayout.
+ ///
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
GRID_TOP_MARGIN,
+
+ ///
+ /// The margin in the bottom of the GridLayout.
+ ///
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
GRID_BOTTOM_MARGIN,
+
+ ///
+ /// The margin in the left and right of the GridLayout.
+ ///
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
GRID_SIDE_MARGIN,
+
+ ///
+ /// The factor used to customise the scroll speed while dragging and swiping the GridLayout.
+ ///
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
GRID_SCROLL_SPEED_FACTOR,
+
+ ///
+ /// The maximum swipe speed in pixels per second of GridLayout.
+ ///
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
GRID_MAXIMUM_SWIPE_SPEED,
+
+ ///
+ /// The duration of the flick animation in seconds of GridLayout.
+ ///
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
GRID_ITEM_FLICK_ANIMATION_DURATION,
+
+ ///
+ /// The number of columns in the DepthLayout.
+ ///
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
DEPTH_COLUMN_NUMBER,
+
+ ///
+ /// The number of rows in the DepthLayout.
+ ///
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
DEPTH_ROW_NUMBER,
+
+ ///
+ /// The spacing between rows in the DepthLayout.
+ ///
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
DEPTH_ROW_SPACING,
+
+ ///
+ /// The factor used to customise the scroll speed while dragging and swiping the DepthLayout.
+ ///
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
DEPTH_SCROLL_SPEED_FACTOR,
+
+ ///
+ /// The maximumSwipSpeed of the DepthLayout.
+ ///
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
DEPTH_MAXIMUM_SWIPE_SPEED,
+
+ ///
+ /// The duration of the flick animation in seconds of DepthLayout.
+ ///
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
DEPTH_ITEM_FLICK_ANIMATION_DURATION,
+
+ ///
+ /// The tilt angle of DepthLayout.
+ ///
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
DEPTH_TILT_ANGLE,
+
+ ///
+ /// The tilt angle of the individual items in the DepthLayout.
+ ///
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
DEPTH_ITEM_TILT_ANGLE,
+
+ ///
+ /// The spacing angle between items in the SpiralLayout.
+ ///
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
SPIRAL_ITEM_SPACING,
+
+ ///
+ /// The factor used to customise the scroll speed while dragging and swiping the SpiralLayout.
+ ///
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
SPIRAL_SCROLL_SPEED_FACTOR,
+
+ ///
+ /// The maximum swipe speed in pixels per second of the SpiralLayout.
+ ///
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
SPIRAL_MAXIMUM_SWIPE_SPEED,
+
+ ///
+ /// The duration of the flick animation in seconds of the SpiralLayout.
+ ///
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
SPIRAL_ITEM_FLICK_ANIMATION_DURATION,
+
+ ///
+ /// The vertical distance for one revolution of the SpiralLayout.
+ ///
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
SPIRAL_REVOLUTION_DISTANCE,
+
+ ///
+ /// The alignment of the top-item, when at the beginning of the SpiralLayout.
+ ///
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
SPIRAL_TOP_ITEM_ALIGNMENT
}
diff --git a/src/Tizen.NUI/src/internal/DefaultItemLayoutType.cs b/src/Tizen.NUI/src/internal/DefaultItemLayoutType.cs
index 1787984..f58cad9 100755
--- a/src/Tizen.NUI/src/internal/DefaultItemLayoutType.cs
+++ b/src/Tizen.NUI/src/internal/DefaultItemLayoutType.cs
@@ -23,9 +23,29 @@ namespace Tizen.NUI
[EditorBrowsable(EditorBrowsableState.Never)]
public enum DefaultItemLayoutType
{
+
+ ///
+ /// Items arranged in a grid, scrolling along the Z-Axis.
+ ///
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
DEPTH,
+
+ ///
+ /// Items arranged in a grid, scrolling along the Y-Axis.
+ ///
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
GRID,
+
+ ///
+ /// One item per line, scrolling along the Y-Axis.
+ ///
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
LIST,
+
+ ///
+ /// Items arranged in a spiral, centered around the Y-Axis.
+ ///
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
SPIRAL
}
diff --git a/src/Tizen.NUI/src/internal/DragAndDropDetector.cs b/src/Tizen.NUI/src/internal/DragAndDropDetector.cs
deleted file mode 100755
index dd0650a..0000000
--- a/src/Tizen.NUI/src/internal/DragAndDropDetector.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright(c) 2017 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-namespace Tizen.NUI
-{
-
- internal class DragAndDropDetector : BaseHandle
- {
- private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-
- internal DragAndDropDetector(global::System.IntPtr cPtr, bool cMemoryOwn) : base(Interop.DragAndDropDetector.DragAndDropDetector_SWIGUpcast(cPtr), cMemoryOwn)
- {
- swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
- }
-
- internal static global::System.Runtime.InteropServices.HandleRef getCPtr(DragAndDropDetector obj)
- {
- return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
- }
-
- protected override 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;
- Interop.DragAndDropDetector.delete_DragAndDropDetector(swigCPtr);
- }
- swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
- }
-
- base.Dispose(type);
- }
-
-
- public DragAndDropDetector() : this(Interop.DragAndDropDetector.new_DragAndDropDetector(), true)
- {
- if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
- }
-
- public string GetContent()
- {
- string ret = Interop.DragAndDropDetector.DragAndDropDetector_GetContent(swigCPtr);
- if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
- return ret;
- }
-
- public Vector2 GetCurrentScreenPosition()
- {
- Vector2 ret = new Vector2(Interop.DragAndDropDetector.DragAndDropDetector_GetCurrentScreenPosition(swigCPtr), true);
- if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
- return ret;
- }
-
- public SWIGTYPE_p_Dali__SignalT_void_fDali__DragAndDropDetectorF_t EnteredSignal()
- {
- SWIGTYPE_p_Dali__SignalT_void_fDali__DragAndDropDetectorF_t ret = new SWIGTYPE_p_Dali__SignalT_void_fDali__DragAndDropDetectorF_t(Interop.DragAndDropDetector.DragAndDropDetector_EnteredSignal(swigCPtr), false);
- if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
- return ret;
- }
-
- public SWIGTYPE_p_Dali__SignalT_void_fDali__DragAndDropDetectorF_t ExitedSignal()
- {
- SWIGTYPE_p_Dali__SignalT_void_fDali__DragAndDropDetectorF_t ret = new SWIGTYPE_p_Dali__SignalT_void_fDali__DragAndDropDetectorF_t(Interop.DragAndDropDetector.DragAndDropDetector_ExitedSignal(swigCPtr), false);
- if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
- return ret;
- }
-
- public SWIGTYPE_p_Dali__SignalT_void_fDali__DragAndDropDetectorF_t MovedSignal()
- {
- SWIGTYPE_p_Dali__SignalT_void_fDali__DragAndDropDetectorF_t ret = new SWIGTYPE_p_Dali__SignalT_void_fDali__DragAndDropDetectorF_t(Interop.DragAndDropDetector.DragAndDropDetector_MovedSignal(swigCPtr), false);
- if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
- return ret;
- }
-
- public SWIGTYPE_p_Dali__SignalT_void_fDali__DragAndDropDetectorF_t DroppedSignal()
- {
- SWIGTYPE_p_Dali__SignalT_void_fDali__DragAndDropDetectorF_t ret = new SWIGTYPE_p_Dali__SignalT_void_fDali__DragAndDropDetectorF_t(Interop.DragAndDropDetector.DragAndDropDetector_DroppedSignal(swigCPtr), false);
- if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
- return ret;
- }
-
- }
-
-}
diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.Adaptor.cs b/src/Tizen.NUI/src/internal/Interop/Interop.Adaptor.cs
index cd83c0a..67c4822 100755
--- a/src/Tizen.NUI/src/internal/Interop/Interop.Adaptor.cs
+++ b/src/Tizen.NUI/src/internal/Interop/Interop.Adaptor.cs
@@ -90,10 +90,6 @@ namespace Tizen.NUI
public static extern void Adaptor_NotifyLanguageChanged(global::System.Runtime.InteropServices.HandleRef jarg1);
- [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Adaptor_SetMinimumPinchDistance")]
- public static extern void Adaptor_SetMinimumPinchDistance(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2);
-
-
[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Adaptor_FeedTouchPoint")]
public static extern void Adaptor_FeedTouchPoint(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, int jarg3);
diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.DragAndDropDetector.cs b/src/Tizen.NUI/src/internal/Interop/Interop.DragAndDropDetector.cs
deleted file mode 100755
index ad0bce3..0000000
--- a/src/Tizen.NUI/src/internal/Interop/Interop.DragAndDropDetector.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Tizen.NUI
-{
- internal static partial class Interop
- {
- internal static partial class DragAndDropDetector
- {
- [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_new_DragAndDropDetector")]
- public static extern global::System.IntPtr new_DragAndDropDetector();
-
-
- [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_delete_DragAndDropDetector")]
- public static extern void delete_DragAndDropDetector(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-
- [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_DragAndDropDetector_GetContent")]
- public static extern string DragAndDropDetector_GetContent(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-
- [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_DragAndDropDetector_GetCurrentScreenPosition")]
- public static extern global::System.IntPtr DragAndDropDetector_GetCurrentScreenPosition(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-
- [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_DragAndDropDetector_EnteredSignal")]
- public static extern global::System.IntPtr DragAndDropDetector_EnteredSignal(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-
- [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_DragAndDropDetector_ExitedSignal")]
- public static extern global::System.IntPtr DragAndDropDetector_ExitedSignal(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-
- [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_DragAndDropDetector_MovedSignal")]
- public static extern global::System.IntPtr DragAndDropDetector_MovedSignal(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-
- [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_DragAndDropDetector_DroppedSignal")]
- public static extern global::System.IntPtr DragAndDropDetector_DroppedSignal(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-
- [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_DragAndDropDetector_SWIGUpcast")]
- public static extern global::System.IntPtr DragAndDropDetector_SWIGUpcast(global::System.IntPtr jarg1);
-
- }
- }
-}
diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.WindowInternal.cs b/src/Tizen.NUI/src/internal/Interop/Interop.WindowInternal.cs
index ef1ee2f..2e9ae05 100755
--- a/src/Tizen.NUI/src/internal/Interop/Interop.WindowInternal.cs
+++ b/src/Tizen.NUI/src/internal/Interop/Interop.WindowInternal.cs
@@ -37,10 +37,6 @@ namespace Tizen.NUI
public static extern int Window_GetPreferredOrientation(global::System.Runtime.InteropServices.HandleRef jarg1);
- [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Window_GetDragAndDropDetector")]
- public static extern global::System.IntPtr Window_GetDragAndDropDetector(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-
[global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Window_GetNativeHandle")]
public static extern global::System.IntPtr Window_GetNativeHandle(global::System.Runtime.InteropServices.HandleRef jarg1);
diff --git a/src/Tizen.NUI/src/internal/Item.cs b/src/Tizen.NUI/src/internal/Item.cs
index 53faae5..3017b56 100755
--- a/src/Tizen.NUI/src/internal/Item.cs
+++ b/src/Tizen.NUI/src/internal/Item.cs
@@ -26,6 +26,9 @@ namespace Tizen.NUI
public class Item : global::System.IDisposable
{
private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+
+ /// swigCMemOwn.
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
protected bool swigCMemOwn;
internal Item(global::System.IntPtr cPtr, bool cMemoryOwn)
@@ -39,12 +42,16 @@ namespace Tizen.NUI
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)
+ /// A Flag to check who called Dispose(). (By User or DisposeQueue)
private bool isDisposeQueued = false;
- //A Flat to check if it is already disposed.
+
+ /// A Flag to check if it is already disposed.
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
protected bool disposed = false;
+ /// Destructor.
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
~Item()
{
if (!isDisposeQueued)
diff --git a/src/Tizen.NUI/src/internal/ItemContainer.cs b/src/Tizen.NUI/src/internal/ItemContainer.cs
index 8e7df1c..aa3682c 100755
--- a/src/Tizen.NUI/src/internal/ItemContainer.cs
+++ b/src/Tizen.NUI/src/internal/ItemContainer.cs
@@ -26,6 +26,9 @@ namespace Tizen.NUI
, global::System.Collections.Generic.IEnumerable-
{
private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+
+ /// swigCMemOwn.
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
protected bool swigCMemOwn;
internal ItemContainer(global::System.IntPtr cPtr, bool cMemoryOwn)
@@ -39,12 +42,15 @@ namespace Tizen.NUI
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)
+ /// 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;
+ /// A Flag to check if it is already disposed.
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
+ protected bool disposed = false;
+ /// Destructor.
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
~ItemContainer()
{
if (!isDisposeQueued)
diff --git a/src/Tizen.NUI/src/internal/ItemFactory.cs b/src/Tizen.NUI/src/internal/ItemFactory.cs
index 38214ab..d595f03 100755
--- a/src/Tizen.NUI/src/internal/ItemFactory.cs
+++ b/src/Tizen.NUI/src/internal/ItemFactory.cs
@@ -26,6 +26,9 @@ namespace Tizen.NUI
public class ItemFactory : global::System.IDisposable
{
private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+
+ /// swigCMemOwn.
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
protected bool swigCMemOwn;
internal ItemFactory(global::System.IntPtr cPtr, bool cMemoryOwn)
@@ -39,12 +42,15 @@ namespace Tizen.NUI
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)
+ /// 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;
+ /// A Flag to check if it is already disposed.
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
+ protected bool disposed = false;
+ /// Destructor.
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
~ItemFactory()
{
if (!isDisposeQueued)
@@ -75,6 +81,8 @@ namespace Tizen.NUI
}
}
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
+ [EditorBrowsable(EditorBrowsableState.Never)]
protected virtual void Dispose(DisposeTypes type)
{
if (disposed)
diff --git a/src/Tizen.NUI/src/internal/ItemIdContainer.cs b/src/Tizen.NUI/src/internal/ItemIdContainer.cs
index 037e3f9..021fd65 100755
--- a/src/Tizen.NUI/src/internal/ItemIdContainer.cs
+++ b/src/Tizen.NUI/src/internal/ItemIdContainer.cs
@@ -26,6 +26,9 @@ namespace Tizen.NUI
, global::System.Collections.Generic.IList
{
private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+
+ /// swigCMemOwn.
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
protected bool swigCMemOwn;
internal ItemIdContainer(global::System.IntPtr cPtr, bool cMemoryOwn)
@@ -39,12 +42,15 @@ namespace Tizen.NUI
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)
+ /// 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;
+ /// A Flag to check if it is already disposed.
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
+ protected bool disposed = false;
+ /// Destructor.
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
~ItemIdContainer()
{
if (!isDisposeQueued)
@@ -75,6 +81,8 @@ namespace Tizen.NUI
}
}
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
+ [EditorBrowsable(EditorBrowsableState.Never)]
protected virtual void Dispose(DisposeTypes type)
{
if (disposed)
diff --git a/src/Tizen.NUI/src/internal/ItemLayout.cs b/src/Tizen.NUI/src/internal/ItemLayout.cs
index 38ff66b..b74ad08 100755
--- a/src/Tizen.NUI/src/internal/ItemLayout.cs
+++ b/src/Tizen.NUI/src/internal/ItemLayout.cs
@@ -37,6 +37,8 @@ namespace Tizen.NUI
return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
}
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
+ [EditorBrowsable(EditorBrowsableState.Never)]
protected override void Dispose(DisposeTypes type)
{
if (disposed)
diff --git a/src/Tizen.NUI/src/internal/ItemRange.cs b/src/Tizen.NUI/src/internal/ItemRange.cs
index 757b049..48fe8c7 100755
--- a/src/Tizen.NUI/src/internal/ItemRange.cs
+++ b/src/Tizen.NUI/src/internal/ItemRange.cs
@@ -25,6 +25,9 @@ namespace Tizen.NUI
public class ItemRange : global::System.IDisposable
{
private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+
+ /// swigCMemOwn.
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
protected bool swigCMemOwn;
internal ItemRange(global::System.IntPtr cPtr, bool cMemoryOwn)
@@ -38,12 +41,15 @@ namespace Tizen.NUI
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)
+ /// 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;
+ /// A Flag to check if it is already disposed.
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
+ protected bool disposed = false;
+ /// Destructor.
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
~ItemRange()
{
if (!isDisposeQueued)
@@ -74,6 +80,8 @@ namespace Tizen.NUI
}
}
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
+ [EditorBrowsable(EditorBrowsableState.Never)]
protected virtual void Dispose(DisposeTypes type)
{
if (disposed)
diff --git a/src/Tizen.NUI/src/internal/ItemView.cs b/src/Tizen.NUI/src/internal/ItemView.cs
index eb7e257..34f6d3c 100755
--- a/src/Tizen.NUI/src/internal/ItemView.cs
+++ b/src/Tizen.NUI/src/internal/ItemView.cs
@@ -39,6 +39,8 @@ namespace Tizen.NUI
return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
}
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
+ [EditorBrowsable(EditorBrowsableState.Never)]
protected override void Dispose(DisposeTypes type)
{
if (disposed)
diff --git a/src/Tizen.NUI/src/internal/RefObject.cs b/src/Tizen.NUI/src/internal/RefObject.cs
index be1b237..48172a9 100755
--- a/src/Tizen.NUI/src/internal/RefObject.cs
+++ b/src/Tizen.NUI/src/internal/RefObject.cs
@@ -24,6 +24,9 @@ namespace Tizen.NUI
public class RefObject : global::System.IDisposable
{
private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+
+ /// swigCMemOwn.
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
protected bool swigCMemOwn;
internal RefObject(global::System.IntPtr cPtr, bool cMemoryOwn)
@@ -37,11 +40,15 @@ namespace Tizen.NUI
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)
+ /// A Flag to check who called Dispose(). (By User or DisposeQueue)
private bool isDisposeQueued = false;
- //A Flat to check if it is already disposed.
+
+ /// A Flag to check if it is already disposed.
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
protected bool disposed = false;
+ /// Destructor.
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
~RefObject()
{
if (!isDisposeQueued)
@@ -72,6 +79,8 @@ namespace Tizen.NUI
}
}
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
+ [EditorBrowsable(EditorBrowsableState.Never)]
protected virtual void Dispose(DisposeTypes type)
{
if (disposed)
diff --git a/src/Tizen.NUI/src/internal/Ruler.cs b/src/Tizen.NUI/src/internal/Ruler.cs
index eeddc4f..8df78bc 100755
--- a/src/Tizen.NUI/src/internal/Ruler.cs
+++ b/src/Tizen.NUI/src/internal/Ruler.cs
@@ -35,6 +35,8 @@ namespace Tizen.NUI
return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
}
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
+ [EditorBrowsable(EditorBrowsableState.Never)]
protected override void Dispose(DisposeTypes type)
{
if (disposed)
@@ -252,7 +254,13 @@ namespace Tizen.NUI
[EditorBrowsable(EditorBrowsableState.Never)]
public enum RulerType
{
+ /// A Fixed ruler.
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
+
Fixed,
+
+ /// A Free ruler.
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
Free
}
diff --git a/src/Tizen.NUI/src/internal/RulerDomain.cs b/src/Tizen.NUI/src/internal/RulerDomain.cs
index f177e45..1f6a998 100755
--- a/src/Tizen.NUI/src/internal/RulerDomain.cs
+++ b/src/Tizen.NUI/src/internal/RulerDomain.cs
@@ -25,6 +25,9 @@ namespace Tizen.NUI
public class RulerDomain : global::System.IDisposable
{
private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+
+ /// swigCMemOwn.
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
protected bool swigCMemOwn;
internal RulerDomain(global::System.IntPtr cPtr, bool cMemoryOwn)
@@ -38,12 +41,16 @@ namespace Tizen.NUI
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)
+ /// A Flag to check who called Dispose(). (By User or DisposeQueue)
private bool isDisposeQueued = false;
- //A Flat to check if it is already disposed.
+
+ /// A Flag to check if it is already disposed.
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
protected bool disposed = false;
+ /// Destructor.
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
~RulerDomain()
{
if (!isDisposeQueued)
@@ -74,6 +81,8 @@ namespace Tizen.NUI
}
}
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
+ [EditorBrowsable(EditorBrowsableState.Never)]
protected virtual void Dispose(DisposeTypes type)
{
if (disposed)
diff --git a/src/Tizen.NUI/src/internal/RulerPtr.cs b/src/Tizen.NUI/src/internal/RulerPtr.cs
index 016c523..6b13b65 100755
--- a/src/Tizen.NUI/src/internal/RulerPtr.cs
+++ b/src/Tizen.NUI/src/internal/RulerPtr.cs
@@ -24,6 +24,9 @@ namespace Tizen.NUI
public class RulerPtr : global::System.IDisposable
{
private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+
+ /// swigCMemOwn.
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
protected bool swigCMemOwn;
internal RulerPtr(global::System.IntPtr cPtr, bool cMemoryOwn)
@@ -37,11 +40,15 @@ namespace Tizen.NUI
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)
+ /// A Flag to check who called Dispose(). (By User or DisposeQueue)
private bool isDisposeQueued = false;
- //A Flat to check if it is already disposed.
+
+ /// A Flag to check if it is already disposed.
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
protected bool disposed = false;
+ /// Destructor.
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
~RulerPtr()
{
@@ -74,6 +81,8 @@ namespace Tizen.NUI
}
}
+ /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
+ [EditorBrowsable(EditorBrowsableState.Never)]
protected virtual void Dispose(DisposeTypes type)
{
if (disposed)
diff --git a/src/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__DragAndDropDetectorF_t.cs b/src/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__DragAndDropDetectorF_t.cs
deleted file mode 100755
index ab9f636..0000000
--- a/src/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__DragAndDropDetectorF_t.cs
+++ /dev/null
@@ -1,34 +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 SWIGTYPE_p_Dali__SignalT_void_fDali__DragAndDropDetectorF_t
- {
- private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-
- internal SWIGTYPE_p_Dali__SignalT_void_fDali__DragAndDropDetectorF_t(global::System.IntPtr cPtr, bool futureUse)
- {
- swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
- }
-
- protected SWIGTYPE_p_Dali__SignalT_void_fDali__DragAndDropDetectorF_t()
- {
- swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
- }
-
- internal static global::System.Runtime.InteropServices.HandleRef getCPtr(SWIGTYPE_p_Dali__SignalT_void_fDali__DragAndDropDetectorF_t obj)
- {
- return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
- }
- }
-
-}
diff --git a/src/Tizen.NUI/src/public/Adaptor.cs b/src/Tizen.NUI/src/public/Adaptor.cs
index df6aaa5..b8ab04f 100755
--- a/src/Tizen.NUI/src/public/Adaptor.cs
+++ b/src/Tizen.NUI/src/public/Adaptor.cs
@@ -373,16 +373,6 @@ namespace Tizen.NUI
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}
- ///
- /// Sets the minimum distance in pixels that the fingers must move towards or away from each other in order to trigger a pinch gesture.
- ///
- /// The minimum pinch distance in pixels.
- internal void SetMinimumPinchDistance(float distance)
- {
- Interop.Adaptor.Adaptor_SetMinimumPinchDistance(swigCPtr, distance);
- if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
- }
-
internal void FeedTouchPoint(TouchPoint point, int timeStamp)
{
Interop.Adaptor.Adaptor_FeedTouchPoint(swigCPtr, TouchPoint.getCPtr(point), timeStamp);
diff --git a/src/Tizen.NUI/src/public/Window.cs b/src/Tizen.NUI/src/public/Window.cs
index 8ea9159..20d3a57 100755
--- a/src/Tizen.NUI/src/public/Window.cs
+++ b/src/Tizen.NUI/src/public/Window.cs
@@ -1224,13 +1224,6 @@ namespace Tizen.NUI
return ret;
}
- internal DragAndDropDetector GetDragAndDropDetector()
- {
- DragAndDropDetector ret = new DragAndDropDetector(Interop.WindowInternal.Window_GetDragAndDropDetector(swigCPtr), true);
- if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
- return ret;
- }
-
internal Any GetNativeHandle()
{
Any ret = new Any(Interop.WindowInternal.Window_GetNativeHandle(swigCPtr), true);