From da46ce56cbfc374cb326bab573315222aed488cf Mon Sep 17 00:00:00 2001
From: dongsug-song <35130733+dongsug-song@users.noreply.github.com>
Date: Fri, 15 Jun 2018 16:47:14 +0900
Subject: [PATCH] [NUI] Add NUI-Layout 2nd patch (#294)
---
.../src/internal/Layouting/LayoutGroup.cs | 19 +------
.../internal/Layouting/LayoutGroupWrapperImpl.cs | 62 ++--------------------
src/Tizen.NUI/src/internal/Layouting/LayoutItem.cs | 55 +------------------
.../src/internal/Layouting/LayoutItemPtr.cs | 9 ++--
.../internal/Layouting/LayoutItemWrapperImpl.cs | 50 +----------------
5 files changed, 11 insertions(+), 184 deletions(-)
diff --git a/src/Tizen.NUI/src/internal/Layouting/LayoutGroup.cs b/src/Tizen.NUI/src/internal/Layouting/LayoutGroup.cs
index e6882ff..6145ef1 100755
--- a/src/Tizen.NUI/src/internal/Layouting/LayoutGroup.cs
+++ b/src/Tizen.NUI/src/internal/Layouting/LayoutGroup.cs
@@ -37,7 +37,6 @@ namespace Tizen.NUI
layoutGroupWrapperImpl.OnMeasure = new LayoutGroupWrapperImpl.OnMeasureDelegate(OnMeasure);
layoutGroupWrapperImpl.OnLayout = new LayoutGroupWrapperImpl.OnLayoutDelegate(OnLayout);
layoutGroupWrapperImpl.OnSizeChanged = new LayoutGroupWrapperImpl.OnSizeChangedDelegate(OnSizeChanged);
- layoutGroupWrapperImpl.OnInitialize = new LayoutGroupWrapperImpl.OnInitializeDelegate(OnInitialize);
layoutGroupWrapperImpl.OnChildAdd = new LayoutGroupWrapperImpl.OnChildAddDelegate(OnChildAdd);
layoutGroupWrapperImpl.OnChildRemove = new LayoutGroupWrapperImpl.OnChildRemoveDelegate(OnChildRemove);
layoutGroupWrapperImpl.DoInitialize = new LayoutGroupWrapperImpl.DoInitializeDelegate(DoInitialize);
@@ -128,23 +127,12 @@ namespace Tizen.NUI
}
///
- /// Initialization method for LayoutGroup to override. This should not be overriden by driving classes.
- ///
- /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
- [EditorBrowsable(EditorBrowsableState.Never)]
- protected sealed override void OnInitialize()
- {
-
- }
-
- ///
/// Callback when child is added to container.
/// Derived classes can use this to set their own child properties on the child layout's owner.
///
/// The Layout child.
internal virtual void OnChildAdd(LayoutItemWrapperImpl child)
{
- //layoutGroupWrapperImpl.OnChildAddNative(child);
}
///
@@ -153,7 +141,6 @@ namespace Tizen.NUI
/// The Layout child.
internal virtual void OnChildRemove(LayoutItemWrapperImpl child)
{
- //layoutGroupWrapperImpl.OnChildRemoveNative(child);
}
///
@@ -163,7 +150,6 @@ namespace Tizen.NUI
[EditorBrowsable(EditorBrowsableState.Never)]
protected virtual void DoInitialize()
{
- //layoutGroupWrapperImpl.DoInitializeNative();
}
///
@@ -174,7 +160,6 @@ namespace Tizen.NUI
[EditorBrowsable(EditorBrowsableState.Never)]
protected virtual void DoRegisterChildProperties(string containerType)
{
- //layoutGroupWrapperImpl.DoRegisterChildPropertiesNative(containerType);
}
///
@@ -188,7 +173,7 @@ namespace Tizen.NUI
[EditorBrowsable(EditorBrowsableState.Never)]
protected virtual void MeasureChildren(LayoutMeasureSpec widthMeasureSpec, LayoutMeasureSpec heightMeasureSpec)
{
- //layoutGroupWrapperImpl.MeasureChildrenNative(widthMeasureSpec, heightMeasureSpec);
+ layoutGroupWrapperImpl.MeasureChildrenNative(widthMeasureSpec, heightMeasureSpec);
}
///
@@ -203,7 +188,7 @@ namespace Tizen.NUI
[EditorBrowsable(EditorBrowsableState.Never)]
protected virtual void MeasureChild(LayoutItem child, LayoutMeasureSpec parentWidthMeasureSpec, LayoutMeasureSpec parentHeightMeasureSpec)
{
- //layoutGroupWrapperImpl.MeasureChildNative(child, parentWidthMeasureSpec, parentHeightMeasureSpec);
+ layoutGroupWrapperImpl.MeasureChildNative(child, parentWidthMeasureSpec, parentHeightMeasureSpec);
}
///
diff --git a/src/Tizen.NUI/src/internal/Layouting/LayoutGroupWrapperImpl.cs b/src/Tizen.NUI/src/internal/Layouting/LayoutGroupWrapperImpl.cs
index 1dca643..ea41da1 100755
--- a/src/Tizen.NUI/src/internal/Layouting/LayoutGroupWrapperImpl.cs
+++ b/src/Tizen.NUI/src/internal/Layouting/LayoutGroupWrapperImpl.cs
@@ -31,12 +31,10 @@ namespace Tizen.NUI
public delegate void OnMeasureDelegate(LayoutMeasureSpec widthMeasureSpec, LayoutMeasureSpec heightMeasureSpec);
public delegate void OnLayoutDelegate(bool changed, LayoutLength left, LayoutLength top, LayoutLength right, LayoutLength bottom);
public delegate void OnSizeChangedDelegate(LayoutSize newSize, LayoutSize oldSize);
- public delegate void OnInitializeDelegate();
public delegate void OnChildAddDelegate(LayoutItemWrapperImpl child);
public delegate void OnChildRemoveDelegate(LayoutItemWrapperImpl child);
public delegate void DoInitializeDelegate();
public delegate void DoRegisterChildPropertiesDelegate(string containerType);
- //public delegate void SwigDelegateLayoutGroupWrapperImpl_11(global::System.IntPtr child);
public delegate void MeasureChildrenDelegate(LayoutMeasureSpec widthMeasureSpec, LayoutMeasureSpec heightMeasureSpec);
public delegate void MeasureChildDelegate(LayoutItem child, LayoutMeasureSpec parentWidthMeasureSpec, LayoutMeasureSpec parentHeightMeasureSpec);
public delegate void MeasureChildWithMarginsDelegate(LayoutItem child, LayoutMeasureSpec parentWidthMeasureSpec, LayoutLength widthUsed, LayoutMeasureSpec parentHeightMeasureSpec, LayoutLength heightUsed);
@@ -44,12 +42,10 @@ namespace Tizen.NUI
public OnMeasureDelegate OnMeasure;
public OnLayoutDelegate OnLayout;
public OnSizeChangedDelegate OnSizeChanged;
- public OnInitializeDelegate OnInitialize;
public OnChildAddDelegate OnChildAdd;
public OnChildRemoveDelegate OnChildRemove;
public DoInitializeDelegate DoInitialize;
public DoRegisterChildPropertiesDelegate DoRegisterChildProperties;
- //public delegate void SwigDelegateLayoutGroupWrapperImpl_11(global::System.IntPtr child);
public MeasureChildrenDelegate MeasureChildren;
public MeasureChildDelegate MeasureChild;
public MeasureChildWithMarginsDelegate MeasureChildWithMargins;
@@ -170,18 +166,6 @@ namespace Tizen.NUI
return ret;
}
- internal void OnChildAddNative(LayoutItemWrapperImpl child)
- {
- LayoutPINVOKE.LayoutGroupWrapperImpl_OnChildAdd(swigCPtr, LayoutItemWrapperImpl.getCPtr(child));
- if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
- }
-
- internal void OnChildRemoveNative(LayoutItemWrapperImpl child)
- {
- LayoutPINVOKE.LayoutGroupWrapperImpl_OnChildRemove(swigCPtr, LayoutItemWrapperImpl.getCPtr(child));
- if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
- }
-
internal static LayoutMeasureSpec GetChildMeasureSpec(LayoutMeasureSpec measureSpec, LayoutLength padding, LayoutLength childDimension)
{
LayoutMeasureSpec ret = new LayoutMeasureSpec(LayoutPINVOKE.LayoutGroupWrapperImpl_GetChildMeasureSpec(LayoutMeasureSpec.getCPtr(measureSpec), LayoutLength.getCPtr(padding), LayoutLength.getCPtr(childDimension)), true);
@@ -189,39 +173,21 @@ namespace Tizen.NUI
return ret;
}
- internal void DoInitializeNative()
- {
- LayoutPINVOKE.LayoutGroupWrapperImpl_DoInitialize(swigCPtr);
- if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
- }
-
- internal virtual void DoRegisterChildPropertiesNative(string containerType)
- {
- LayoutPINVOKE.LayoutGroupWrapperImpl_DoRegisterChildProperties(swigCPtr, containerType);
- if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
- }
-
- /*protected virtual void GenerateDefaultChildPropertyValues(Handle child)
- {
- LayoutPINVOKE.LayoutGroupWrapperImpl_GenerateDefaultChildPropertyValuesSwigExplicitLayoutGroupWrapperImpl(swigCPtr, Handle.getCPtr(child)); else LayoutPINVOKE.LayoutGroupWrapperImpl_GenerateDefaultChildPropertyValues(swigCPtr, Handle.getCPtr(child));
- if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
- }*/
-
internal virtual void MeasureChildrenNative(LayoutMeasureSpec widthMeasureSpec, LayoutMeasureSpec heightMeasureSpec)
{
- LayoutPINVOKE.LayoutGroupWrapperImpl_MeasureChildren(swigCPtr, LayoutMeasureSpec.getCPtr(widthMeasureSpec), LayoutMeasureSpec.getCPtr(heightMeasureSpec));
+ LayoutPINVOKE.LayoutGroupWrapperImpl_MeasureChildrenSwigExplicitLayoutGroupWrapperImpl(swigCPtr, LayoutMeasureSpec.getCPtr(widthMeasureSpec), LayoutMeasureSpec.getCPtr(heightMeasureSpec));
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}
internal void MeasureChildNative(LayoutItem child, LayoutMeasureSpec parentWidthMeasureSpec, LayoutMeasureSpec parentHeightMeasureSpec)
{
- LayoutPINVOKE.LayoutGroupWrapperImpl_MeasureChild(swigCPtr, LayoutItem.getCPtr(child), LayoutMeasureSpec.getCPtr(parentWidthMeasureSpec), LayoutMeasureSpec.getCPtr(parentHeightMeasureSpec));
+ LayoutPINVOKE.LayoutGroupWrapperImpl_MeasureChildSwigExplicitLayoutGroupWrapperImpl(swigCPtr, LayoutItem.getCPtr(child), LayoutMeasureSpec.getCPtr(parentWidthMeasureSpec), LayoutMeasureSpec.getCPtr(parentHeightMeasureSpec));
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}
internal void MeasureChildWithMarginsNative(LayoutItem child, LayoutMeasureSpec parentWidthMeasureSpec, LayoutLength widthUsed, LayoutMeasureSpec parentHeightMeasureSpec, LayoutLength heightUsed)
{
- LayoutPINVOKE.LayoutGroupWrapperImpl_MeasureChildWithMargins(swigCPtr, LayoutItem.getCPtr(child), LayoutMeasureSpec.getCPtr(parentWidthMeasureSpec), LayoutLength.getCPtr(widthUsed), LayoutMeasureSpec.getCPtr(parentHeightMeasureSpec), LayoutLength.getCPtr(heightUsed));
+ LayoutPINVOKE.LayoutGroupWrapperImpl_MeasureChildWithMarginsSwigExplicitLayoutGroupWrapperImpl(swigCPtr, LayoutItem.getCPtr(child), LayoutMeasureSpec.getCPtr(parentWidthMeasureSpec), LayoutLength.getCPtr(widthUsed), LayoutMeasureSpec.getCPtr(parentHeightMeasureSpec), LayoutLength.getCPtr(heightUsed));
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}
@@ -233,12 +199,10 @@ namespace Tizen.NUI
swigDelegate3 = new SwigDelegateLayoutGroupWrapperImpl_3(SwigDirectorOnMeasure);
swigDelegate4 = new SwigDelegateLayoutGroupWrapperImpl_4(SwigDirectorOnLayout);
swigDelegate5 = new SwigDelegateLayoutGroupWrapperImpl_5(SwigDirectorOnSizeChanged);
- swigDelegate6 = new SwigDelegateLayoutGroupWrapperImpl_6(SwigDirectorOnInitialize);
swigDelegate7 = new SwigDelegateLayoutGroupWrapperImpl_7(SwigDirectorOnChildAdd);
swigDelegate8 = new SwigDelegateLayoutGroupWrapperImpl_8(SwigDirectorOnChildRemove);
swigDelegate9 = new SwigDelegateLayoutGroupWrapperImpl_9(SwigDirectorDoInitialize);
swigDelegate10 = new SwigDelegateLayoutGroupWrapperImpl_10(SwigDirectorDoRegisterChildProperties);
- //swigDelegate11 = new SwigDelegateLayoutGroupWrapperImpl_11(SwigDirectorGenerateDefaultChildPropertyValues);
swigDelegate12 = new SwigDelegateLayoutGroupWrapperImpl_12(SwigDirectorMeasureChildren);
swigDelegate13 = new SwigDelegateLayoutGroupWrapperImpl_13(SwigDirectorMeasureChild);
swigDelegate14 = new SwigDelegateLayoutGroupWrapperImpl_14(SwigDirectorMeasureChildWithMargins);
@@ -251,16 +215,6 @@ namespace Tizen.NUI
return LayoutParent.getCPtr(GetParent()).Handle;
}*/
- private void SwigDirectorOnUnparent()
- {
- OnUnparent();
- }
-
- private void SwigDirectorOnRegisterChildProperties(string containerType)
- {
- OnRegisterChildProperties(containerType);
- }
-
private void SwigDirectorOnMeasure(global::System.IntPtr widthMeasureSpec, global::System.IntPtr heightMeasureSpec)
{
OnMeasure(new LayoutMeasureSpec(widthMeasureSpec, true), new LayoutMeasureSpec(heightMeasureSpec, true));
@@ -276,11 +230,6 @@ namespace Tizen.NUI
OnSizeChanged(new LayoutSize(newSize, true), new LayoutSize(oldSize, true));
}
- private void SwigDirectorOnInitialize()
- {
- OnInitialize();
- }
-
private void SwigDirectorOnChildAdd(global::System.IntPtr child)
{
OnChildAdd(new LayoutItemWrapperImpl(child, false));
@@ -301,11 +250,6 @@ namespace Tizen.NUI
DoRegisterChildProperties(containerType);
}
- private void SwigDirectorGenerateDefaultChildPropertyValues(global::System.IntPtr child)
- {
- //GenerateDefaultChildPropertyValues(new Handle(child, true));
- }
-
private void SwigDirectorMeasureChildren(global::System.IntPtr widthMeasureSpec, global::System.IntPtr heightMeasureSpec)
{
MeasureChildren(new LayoutMeasureSpec(widthMeasureSpec, true), new LayoutMeasureSpec(heightMeasureSpec, true));
diff --git a/src/Tizen.NUI/src/internal/Layouting/LayoutItem.cs b/src/Tizen.NUI/src/internal/Layouting/LayoutItem.cs
index 78901e5..4fbdaf4 100755
--- a/src/Tizen.NUI/src/internal/Layouting/LayoutItem.cs
+++ b/src/Tizen.NUI/src/internal/Layouting/LayoutItem.cs
@@ -39,12 +39,9 @@ namespace Tizen.NUI
internal void LayoutItemInitialize(LayoutItemWrapperImpl implementation)
{
layoutItemWrapperImpl = implementation;
- layoutItemWrapperImpl.OnUnparent = new LayoutItemWrapperImpl.OnUnparentDelegate(OnUnparent);
- layoutItemWrapperImpl.OnRegisterChildProperties = new LayoutItemWrapperImpl.OnRegisterChildPropertiesDelegate(OnRegisterChildProperties);
layoutItemWrapperImpl.OnMeasure = new LayoutItemWrapperImpl.OnMeasureDelegate(OnMeasure);
layoutItemWrapperImpl.OnLayout = new LayoutItemWrapperImpl.OnLayoutDelegate(OnLayout);
layoutItemWrapperImpl.OnSizeChanged = new LayoutItemWrapperImpl.OnSizeChangedDelegate(OnSizeChanged);
- layoutItemWrapperImpl.OnInitialize = new LayoutItemWrapperImpl.OnInitializeDelegate(OnInitialize);
}
///
@@ -65,19 +62,6 @@ namespace Tizen.NUI
}
///
- /// Register child properties of layout with owner type.
- /// The Actor hierarchy uses these registered properties in the type
- /// system to ensure child custom properties are properly initialized.
- ///
- /// The type of the containing view (owner).
- /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
- [EditorBrowsable(EditorBrowsableState.Never)]
- public void RegisterChildProperties(string containerType)
- {
- //layoutItemWrapperImpl.RegisterChildProperties(containerType);
- }
-
- ///
/// This is called to find out how big a layout should be.
/// The parent supplies constraint information in the width and height parameters.
/// The actual measurement work of a layout is performed in OnMeasure called by this
@@ -87,7 +71,7 @@ namespace Tizen.NUI
/// Vertical space requirements as imposed by the parent.
internal void Measure(LayoutMeasureSpec widthMeasureSpec, LayoutMeasureSpec heightMeasureSpec)
{
- //layoutItemWrapperImpl.Measure(widthMeasureSpec, heightMeasureSpec);
+ layoutItemWrapperImpl.Measure(widthMeasureSpec, heightMeasureSpec);
}
///
@@ -384,27 +368,6 @@ namespace Tizen.NUI
}
///
- /// Allow directly deriving classes to remove layout children when unparented.
- ///
- /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
- [EditorBrowsable(EditorBrowsableState.Never)]
- protected virtual void OnUnparent()
- {
- //layoutItemWrapperImpl.OnUnparentNative();
- }
-
- ///
- /// Ensure direct derived types register their child properties with the owner.
- ///
- /// The type name of the owner container.
- /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
- [EditorBrowsable(EditorBrowsableState.Never)]
- protected virtual void OnRegisterChildProperties(string containerType)
- {
- //layoutItemWrapperImpl.OnRegisterChildPropertiesNative(containerType);
- }
-
- ///
/// Measure the layout and its content to determine the measured width and the
/// measured height.
/// The base class implementation of measure defaults to the background size,
@@ -419,7 +382,7 @@ namespace Tizen.NUI
[EditorBrowsable(EditorBrowsableState.Never)]
protected virtual void OnMeasure(LayoutMeasureSpec widthMeasureSpec, LayoutMeasureSpec heightMeasureSpec)
{
- //layoutItemWrapperImpl.OnMeasureNative(widthMeasureSpec, heightMeasureSpec);
+ layoutItemWrapperImpl.OnMeasureNative(widthMeasureSpec, heightMeasureSpec);
}
///
@@ -435,7 +398,6 @@ namespace Tizen.NUI
[EditorBrowsable(EditorBrowsableState.Never)]
protected virtual void OnLayout(bool changed, LayoutLength left, LayoutLength top, LayoutLength right, LayoutLength bottom)
{
- //layoutItemWrapperImpl.OnLayoutNative(changed, left, top, right, bottom);
}
///
@@ -443,21 +405,8 @@ namespace Tizen.NUI
///
/// The new size of the layout.
/// The old size of the layout.
- /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
- [EditorBrowsable(EditorBrowsableState.Never)]
protected virtual void OnSizeChanged(LayoutSize newSize, LayoutSize oldSize)
{
- //layoutItemWrapperImpl.OnSizeChangedNative(newSize, oldSize);
- }
-
- ///
- /// Initialization method for LayoutGroup to override.
- ///
- /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
- [EditorBrowsable(EditorBrowsableState.Never)]
- protected virtual void OnInitialize()
- {
- //layoutItemWrapperImpl.OnInitializeNative();
}
}
}
\ No newline at end of file
diff --git a/src/Tizen.NUI/src/internal/Layouting/LayoutItemPtr.cs b/src/Tizen.NUI/src/internal/Layouting/LayoutItemPtr.cs
index 4a04055..185cc6f 100755
--- a/src/Tizen.NUI/src/internal/Layouting/LayoutItemPtr.cs
+++ b/src/Tizen.NUI/src/internal/Layouting/LayoutItemPtr.cs
@@ -42,12 +42,9 @@ namespace Tizen.NUI
public virtual void Dispose()
{
- lock (this)
- {
- if (swigCPtr.Handle != global::System.IntPtr.Zero)
- {
- if (swigCMemOwn)
- {
+ lock(this) {
+ if (swigCPtr.Handle != global::System.IntPtr.Zero) {
+ if (swigCMemOwn) {
swigCMemOwn = false;
LayoutPINVOKE.delete_LayoutItemPtr(swigCPtr);
}
diff --git a/src/Tizen.NUI/src/internal/Layouting/LayoutItemWrapperImpl.cs b/src/Tizen.NUI/src/internal/Layouting/LayoutItemWrapperImpl.cs
index 287c836..3be07bc 100755
--- a/src/Tizen.NUI/src/internal/Layouting/LayoutItemWrapperImpl.cs
+++ b/src/Tizen.NUI/src/internal/Layouting/LayoutItemWrapperImpl.cs
@@ -23,19 +23,13 @@ namespace Tizen.NUI
{
private global::System.Runtime.InteropServices.HandleRef swigCPtr;
- public delegate void OnUnparentDelegate();
- public delegate void OnRegisterChildPropertiesDelegate(string containerType);
public delegate void OnMeasureDelegate(LayoutMeasureSpec widthMeasureSpec, LayoutMeasureSpec heightMeasureSpec);
public delegate void OnLayoutDelegate(bool changed, LayoutLength left, LayoutLength top, LayoutLength right, LayoutLength bottom);
public delegate void OnSizeChangedDelegate(LayoutSize newSize, LayoutSize oldSize);
- public delegate void OnInitializeDelegate();
- public OnUnparentDelegate OnUnparent;
- public OnRegisterChildPropertiesDelegate OnRegisterChildProperties;
public OnMeasureDelegate OnMeasure;
public OnLayoutDelegate OnLayout;
public OnSizeChangedDelegate OnSizeChanged;
- public OnInitializeDelegate OnInitialize;
internal LayoutItemWrapperImpl(global::System.IntPtr cPtr, bool cMemoryOwn) : base(LayoutPINVOKE.LayoutItemWrapperImpl_SWIGUpcast(cPtr), cMemoryOwn)
{
@@ -121,12 +115,6 @@ namespace Tizen.NUI
return ret;
}
- internal void RegisterChildProperties(string containerType)
- {
- LayoutPINVOKE.LayoutItemWrapperImpl_RegisterChildProperties(swigCPtr, containerType);
- if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
- }
-
internal void Measure(LayoutMeasureSpec widthMeasureSpec, LayoutMeasureSpec heightMeasureSpec)
{
LayoutPINVOKE.LayoutItemWrapperImpl_Measure(swigCPtr, LayoutMeasureSpec.getCPtr(widthMeasureSpec), LayoutMeasureSpec.getCPtr(heightMeasureSpec));
@@ -249,21 +237,9 @@ namespace Tizen.NUI
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}
- internal void OnUnparentNative()
- {
- LayoutPINVOKE.LayoutItemWrapperImpl_OnUnparent(swigCPtr);
- if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
- }
-
- internal void OnRegisterChildPropertiesNative(string containerType)
- {
- LayoutPINVOKE.LayoutItemWrapperImpl_OnRegisterChildProperties(swigCPtr, containerType);
- if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
- }
-
internal void OnMeasureNative(LayoutMeasureSpec widthMeasureSpec, LayoutMeasureSpec heightMeasureSpec)
{
- LayoutPINVOKE.LayoutItemWrapperImpl_OnMeasure(swigCPtr, LayoutMeasureSpec.getCPtr(widthMeasureSpec), LayoutMeasureSpec.getCPtr(heightMeasureSpec));
+ LayoutPINVOKE.LayoutItemWrapperImpl_OnMeasureSwigExplicitLayoutItemWrapperImpl(swigCPtr, LayoutMeasureSpec.getCPtr(widthMeasureSpec), LayoutMeasureSpec.getCPtr(heightMeasureSpec));
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}
@@ -279,21 +255,12 @@ namespace Tizen.NUI
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}
- internal void OnInitializeNative()
- {
- LayoutPINVOKE.LayoutItemWrapperImpl_OnInitialize(swigCPtr);
- if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
- }
-
protected void SwigDirectorConnect()
{
//swigDelegate0 = new SwigDelegateLayoutItemWrapperImpl_0(SwigDirectorGetParent);
- swigDelegate1 = new SwigDelegateLayoutItemWrapperImpl_1(SwigDirectorOnUnparent);
- swigDelegate2 = new SwigDelegateLayoutItemWrapperImpl_2(SwigDirectorOnRegisterChildProperties);
swigDelegate3 = new SwigDelegateLayoutItemWrapperImpl_3(SwigDirectorOnMeasure);
swigDelegate4 = new SwigDelegateLayoutItemWrapperImpl_4(SwigDirectorOnLayout);
swigDelegate5 = new SwigDelegateLayoutItemWrapperImpl_5(SwigDirectorOnSizeChanged);
- swigDelegate6 = new SwigDelegateLayoutItemWrapperImpl_6(SwigDirectorOnInitialize);
LayoutPINVOKE.LayoutItemWrapperImpl_director_connect(swigCPtr, swigDelegate0, swigDelegate1, swigDelegate2, swigDelegate3, swigDelegate4, swigDelegate5, swigDelegate6);
}
@@ -310,16 +277,6 @@ namespace Tizen.NUI
return ILayoutParent.getCPtr(GetParent()).Handle;
}*/
- private void SwigDirectorOnUnparent()
- {
- OnUnparent();
- }
-
- private void SwigDirectorOnRegisterChildProperties(string containerType)
- {
- OnRegisterChildProperties(containerType);
- }
-
private void SwigDirectorOnMeasure(global::System.IntPtr widthMeasureSpec, global::System.IntPtr heightMeasureSpec)
{
OnMeasure(new LayoutMeasureSpec(widthMeasureSpec, true), new LayoutMeasureSpec(heightMeasureSpec, true));
@@ -335,11 +292,6 @@ namespace Tizen.NUI
OnSizeChanged(new LayoutSize(newSize, true), new LayoutSize(oldSize, true));
}
- private void SwigDirectorOnInitialize()
- {
- OnInitialize();
- }
-
public delegate global::System.IntPtr SwigDelegateLayoutItemWrapperImpl_0();
public delegate void SwigDelegateLayoutItemWrapperImpl_1();
public delegate void SwigDelegateLayoutItemWrapperImpl_2(string containerType);
--
2.7.4