From ca29de93874ecada2b97383c19848327ec72aa2f Mon Sep 17 00:00:00 2001 From: "xb.teng" Date: Sun, 19 Mar 2017 21:05:14 +0800 Subject: [PATCH] dali-1.2.31, nui 0.2.31 upgrade Change-Id: I266c2143245fe0c42752927ea6d8d263f95db16f Signed-off-by: xb.teng --- src/Tizen.NUI/src/internal/DefaultRuler.cs | 2 +- src/Tizen.NUI/src/internal/DirectionBias.cs | 2 +- src/Tizen.NUI/src/internal/FixedRuler.cs | 2 +- src/Tizen.NUI/src/internal/Ruler.cs | 6 +- src/Tizen.NUI/src/internal/RulerDomain.cs | 4 +- src/Tizen.NUI/src/internal/RulerPtr.cs | 6 +- src/Tizen.NUI/src/internal/ScrollView.cs | 94 +++++++++++----------- src/Tizen.NUI/src/internal/ScrollViewEffect.cs | 2 +- src/Tizen.NUI/src/internal/Scrollable.cs | 8 +- src/Tizen.NUI/src/internal/ViewWrapperImpl.cs | 5 +- .../src/internal/VisualTransformPolicyType.cs | 18 +++++ .../src/internal/VisualTransformPropertyType.cs | 3 +- src/Tizen.NUI/src/public/Actor.cs | 2 +- src/Tizen.NUI/src/public/CustomView.cs | 7 +- src/Tizen.NUI/src/public/VisualMaps.cs | 34 ++++++-- 15 files changed, 119 insertions(+), 76 deletions(-) create mode 100755 src/Tizen.NUI/src/internal/VisualTransformPolicyType.cs diff --git a/src/Tizen.NUI/src/internal/DefaultRuler.cs b/src/Tizen.NUI/src/internal/DefaultRuler.cs index c3ad78b..c3654ac 100755 --- a/src/Tizen.NUI/src/internal/DefaultRuler.cs +++ b/src/Tizen.NUI/src/internal/DefaultRuler.cs @@ -10,7 +10,7 @@ namespace Tizen.NUI { - internal class DefaultRuler : Ruler { + public class DefaultRuler : Ruler { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal DefaultRuler(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.DefaultRuler_SWIGUpcast(cPtr), cMemoryOwn) { diff --git a/src/Tizen.NUI/src/internal/DirectionBias.cs b/src/Tizen.NUI/src/internal/DirectionBias.cs index 78c76c6..67dd599 100755 --- a/src/Tizen.NUI/src/internal/DirectionBias.cs +++ b/src/Tizen.NUI/src/internal/DirectionBias.cs @@ -10,7 +10,7 @@ namespace Tizen.NUI { - internal enum DirectionBias { + public enum DirectionBias { DirectionBiasLeft = -1, DirectionBiasNone = 0, DirectionBiasRight = 1 diff --git a/src/Tizen.NUI/src/internal/FixedRuler.cs b/src/Tizen.NUI/src/internal/FixedRuler.cs index cf75809..e437e95 100755 --- a/src/Tizen.NUI/src/internal/FixedRuler.cs +++ b/src/Tizen.NUI/src/internal/FixedRuler.cs @@ -10,7 +10,7 @@ namespace Tizen.NUI { - internal class FixedRuler : Ruler { + public class FixedRuler : Ruler { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal FixedRuler(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.FixedRuler_SWIGUpcast(cPtr), cMemoryOwn) { diff --git a/src/Tizen.NUI/src/internal/Ruler.cs b/src/Tizen.NUI/src/internal/Ruler.cs index 78f670c..c1a5300 100755 --- a/src/Tizen.NUI/src/internal/Ruler.cs +++ b/src/Tizen.NUI/src/internal/Ruler.cs @@ -10,7 +10,7 @@ namespace Tizen.NUI { - internal class Ruler : RefObject { + public class Ruler : RefObject { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal Ruler(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Ruler_SWIGUpcast(cPtr), cMemoryOwn) { @@ -121,7 +121,7 @@ namespace Tizen.NUI { return ret; } - public float Clamp(float x, float length, float scale, SWIGTYPE_p_Dali__Toolkit__ClampState clamped) { + internal float Clamp(float x, float length, float scale, SWIGTYPE_p_Dali__Toolkit__ClampState clamped) { float ret = NDalicPINVOKE.Ruler_Clamp__SWIG_3(swigCPtr, x, length, scale, SWIGTYPE_p_Dali__Toolkit__ClampState.getCPtr(clamped)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -151,7 +151,7 @@ namespace Tizen.NUI { return ret; } - public float SnapAndClamp(float x, float bias, float length, float scale, SWIGTYPE_p_Dali__Toolkit__ClampState clamped) { + internal float SnapAndClamp(float x, float bias, float length, float scale, SWIGTYPE_p_Dali__Toolkit__ClampState clamped) { float ret = NDalicPINVOKE.Ruler_SnapAndClamp__SWIG_4(swigCPtr, x, bias, length, scale, SWIGTYPE_p_Dali__Toolkit__ClampState.getCPtr(clamped)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; diff --git a/src/Tizen.NUI/src/internal/RulerDomain.cs b/src/Tizen.NUI/src/internal/RulerDomain.cs index d707a2c..67e1d1a 100755 --- a/src/Tizen.NUI/src/internal/RulerDomain.cs +++ b/src/Tizen.NUI/src/internal/RulerDomain.cs @@ -10,7 +10,7 @@ namespace Tizen.NUI { - internal class RulerDomain : global::System.IDisposable { + public class RulerDomain : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; @@ -102,7 +102,7 @@ namespace Tizen.NUI { return ret; } - public float Clamp(float x, float length, float scale, SWIGTYPE_p_Dali__Toolkit__ClampState clamped) { + internal float Clamp(float x, float length, float scale, SWIGTYPE_p_Dali__Toolkit__ClampState clamped) { float ret = NDalicPINVOKE.RulerDomain_Clamp__SWIG_3(swigCPtr, x, length, scale, SWIGTYPE_p_Dali__Toolkit__ClampState.getCPtr(clamped)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; diff --git a/src/Tizen.NUI/src/internal/RulerPtr.cs b/src/Tizen.NUI/src/internal/RulerPtr.cs index 050c8ac..22029ca 100755 --- a/src/Tizen.NUI/src/internal/RulerPtr.cs +++ b/src/Tizen.NUI/src/internal/RulerPtr.cs @@ -10,7 +10,7 @@ namespace Tizen.NUI { - internal class RulerPtr : global::System.IDisposable { + public class RulerPtr : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; @@ -193,7 +193,7 @@ namespace Tizen.NUI { return ret; } - public float Clamp(float x, float length, float scale, SWIGTYPE_p_Dali__Toolkit__ClampState clamped) { + internal float Clamp(float x, float length, float scale, SWIGTYPE_p_Dali__Toolkit__ClampState clamped) { float ret = NDalicPINVOKE.RulerPtr_Clamp__SWIG_3(swigCPtr, x, length, scale, SWIGTYPE_p_Dali__Toolkit__ClampState.getCPtr(clamped)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -223,7 +223,7 @@ namespace Tizen.NUI { return ret; } - public float SnapAndClamp(float x, float bias, float length, float scale, SWIGTYPE_p_Dali__Toolkit__ClampState clamped) { + internal float SnapAndClamp(float x, float bias, float length, float scale, SWIGTYPE_p_Dali__Toolkit__ClampState clamped) { float ret = NDalicPINVOKE.RulerPtr_SnapAndClamp__SWIG_4(swigCPtr, x, bias, length, scale, SWIGTYPE_p_Dali__Toolkit__ClampState.getCPtr(clamped)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; diff --git a/src/Tizen.NUI/src/internal/ScrollView.cs b/src/Tizen.NUI/src/internal/ScrollView.cs index adccacd..3f17dcb 100755 --- a/src/Tizen.NUI/src/internal/ScrollView.cs +++ b/src/Tizen.NUI/src/internal/ScrollView.cs @@ -30,7 +30,7 @@ using System; using System.Runtime.InteropServices; - internal class ScrollView : Scrollable { + public class ScrollView : Scrollable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal ScrollView(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ScrollView_SWIGUpcast(cPtr), cMemoryOwn) { @@ -64,8 +64,6 @@ using System.Runtime.InteropServices; } } - - /** * @brief Event arguments that passed via SnapStarted signal * @@ -153,20 +151,20 @@ public class SnapStartedEventArgs : EventArgs public class ClampEvent : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; - + internal ClampEvent(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(ClampEvent obj) { return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; } - + ~ClampEvent() { Dispose(); } - + public virtual void Dispose() { lock(this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) { @@ -179,68 +177,68 @@ public class SnapStartedEventArgs : EventArgs global::System.GC.SuppressFinalize(this); } } - - public ClampState2D scale { + + 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; - } + } } - - public ClampState2D position { + + 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; - } + } } - - public ClampState rotation { + + 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(); } - + } public class SnapEvent : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; - + internal SnapEvent(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(SnapEvent obj) { return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; } - + ~SnapEvent() { Dispose(); } - + public virtual void Dispose() { lock(this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) { @@ -253,73 +251,73 @@ public class SnapStartedEventArgs : EventArgs global::System.GC.SuppressFinalize(this); } } - + public static SnapEvent GetSnapEventFromPtr(global::System.IntPtr cPtr) { SnapEvent ret = new SnapEvent(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - - public SnapType type { + + internal SnapType type { set { NDalicPINVOKE.ScrollView_SnapEvent_type_set(swigCPtr, (int)value); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } + } get { SnapType ret = (SnapType)NDalicPINVOKE.ScrollView_SnapEvent_type_get(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; - } + } } - + public Vector2 position { set { NDalicPINVOKE.ScrollView_SnapEvent_position_set(swigCPtr, Vector2.getCPtr(value)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } + } get { global::System.IntPtr cPtr = NDalicPINVOKE.ScrollView_SnapEvent_position_get(swigCPtr); Vector2 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector2(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; - } + } } - + public float duration { set { NDalicPINVOKE.ScrollView_SnapEvent_duration_set(swigCPtr, value); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } + } get { float ret = NDalicPINVOKE.ScrollView_SnapEvent_duration_get(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; - } + } } - + public SnapEvent() : this(NDalicPINVOKE.new_ScrollView_SnapEvent(), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - + } public class Property : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; - + internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) { swigCMemOwn = cMemoryOwn; swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); } - + internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) { return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; } - + ~Property() { Dispose(); } - + public virtual void Dispose() { lock(this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) { @@ -332,11 +330,11 @@ public class SnapStartedEventArgs : EventArgs global::System.GC.SuppressFinalize(this); } } - + public Property() : this(NDalicPINVOKE.new_ScrollView_Property(), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - + public static readonly int WRAP_ENABLED = NDalicPINVOKE.ScrollView_Property_WRAP_ENABLED_get(); 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(); @@ -362,7 +360,7 @@ public class SnapStartedEventArgs : EventArgs public static readonly int SCROLL_DOMAIN_OFFSET = NDalicPINVOKE.ScrollView_Property_SCROLL_DOMAIN_OFFSET_get(); public static readonly int SCROLL_POSITION_DELTA = NDalicPINVOKE.ScrollView_Property_SCROLL_POSITION_DELTA_get(); public static readonly int START_PAGE_POSITION = NDalicPINVOKE.ScrollView_Property_START_PAGE_POSITION_get(); - + } public ScrollView () : this (NDalicPINVOKE.ScrollView_New(), true) { @@ -636,7 +634,7 @@ public class SnapStartedEventArgs : EventArgs return ret; } - public void ApplyConstraintToChildren(SWIGTYPE_p_Dali__Constraint constraint) { + internal void ApplyConstraintToChildren(SWIGTYPE_p_Dali__Constraint constraint) { NDalicPINVOKE.ScrollView_ApplyConstraintToChildren(swigCPtr, SWIGTYPE_p_Dali__Constraint.getCPtr(constraint)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -686,7 +684,7 @@ public class SnapStartedEventArgs : EventArgs if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public ScrollViewSnapStartedSignal SnapStartedSignal() { + internal ScrollViewSnapStartedSignal SnapStartedSignal() { ScrollViewSnapStartedSignal ret = new ScrollViewSnapStartedSignal(NDalicPINVOKE.ScrollView_SnapStartedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; diff --git a/src/Tizen.NUI/src/internal/ScrollViewEffect.cs b/src/Tizen.NUI/src/internal/ScrollViewEffect.cs index 27489f3..1b7473c 100755 --- a/src/Tizen.NUI/src/internal/ScrollViewEffect.cs +++ b/src/Tizen.NUI/src/internal/ScrollViewEffect.cs @@ -10,7 +10,7 @@ namespace Tizen.NUI { - internal class ScrollViewEffect : BaseHandle { + public class ScrollViewEffect : BaseHandle { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal ScrollViewEffect(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ScrollViewEffect_SWIGUpcast(cPtr), cMemoryOwn) { diff --git a/src/Tizen.NUI/src/internal/Scrollable.cs b/src/Tizen.NUI/src/internal/Scrollable.cs index ddb031e..4000b90 100755 --- a/src/Tizen.NUI/src/internal/Scrollable.cs +++ b/src/Tizen.NUI/src/internal/Scrollable.cs @@ -14,7 +14,7 @@ using System; using System.Runtime.InteropServices; - internal class Scrollable : View { + public class Scrollable : View { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal Scrollable(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Scrollable_SWIGUpcast(cPtr), cMemoryOwn) { @@ -359,19 +359,19 @@ public class CompletedEventArgs : EventArgs return ret; } - public ScrollableSignal ScrollStartedSignal() { + internal ScrollableSignal ScrollStartedSignal() { ScrollableSignal ret = new ScrollableSignal(NDalicPINVOKE.Scrollable_ScrollStartedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public ScrollableSignal ScrollUpdatedSignal() { + internal ScrollableSignal ScrollUpdatedSignal() { ScrollableSignal ret = new ScrollableSignal(NDalicPINVOKE.Scrollable_ScrollUpdatedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public ScrollableSignal ScrollCompletedSignal() { + internal ScrollableSignal ScrollCompletedSignal() { ScrollableSignal ret = new ScrollableSignal(NDalicPINVOKE.Scrollable_ScrollCompletedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; diff --git a/src/Tizen.NUI/src/internal/ViewWrapperImpl.cs b/src/Tizen.NUI/src/internal/ViewWrapperImpl.cs index c1015ef..026364a 100755 --- a/src/Tizen.NUI/src/internal/ViewWrapperImpl.cs +++ b/src/Tizen.NUI/src/internal/ViewWrapperImpl.cs @@ -308,7 +308,10 @@ namespace Tizen.NUI private void DirectorOnPropertySet(int index, global::System.IntPtr propertyValue) { - OnPropertySet(index, new PropertyValue(propertyValue, true)); + if ( OnPropertySet != null ) + { + OnPropertySet(index, new PropertyValue(propertyValue, true)); + } } private void DirectorOnSizeSet(global::System.IntPtr targetSize) diff --git a/src/Tizen.NUI/src/internal/VisualTransformPolicyType.cs b/src/Tizen.NUI/src/internal/VisualTransformPolicyType.cs new file mode 100755 index 0000000..61c0b69 --- /dev/null +++ b/src/Tizen.NUI/src/internal/VisualTransformPolicyType.cs @@ -0,0 +1,18 @@ +//------------------------------------------------------------------------------ +// +// +// This file was automatically generated by SWIG (http://www.swig.org). +// Version 3.0.12 +// +// Do not make changes to this file unless you know what you are doing--modify +// the SWIG interface file instead. +//------------------------------------------------------------------------------ + +namespace Tizen.NUI { + +public enum VisualTransformPolicyType { + RELATIVE = 0, + ABSOLUTE = 1 +} + +} diff --git a/src/Tizen.NUI/src/internal/VisualTransformPropertyType.cs b/src/Tizen.NUI/src/internal/VisualTransformPropertyType.cs index 816a8e5..b659d50 100755 --- a/src/Tizen.NUI/src/internal/VisualTransformPropertyType.cs +++ b/src/Tizen.NUI/src/internal/VisualTransformPropertyType.cs @@ -15,7 +15,8 @@ public enum VisualTransformPropertyType { SIZE, ORIGIN, ANCHOR_POINT, - OFFSET_SIZE_MODE + OFFSET_POLICY, + SIZE_POLICY } } diff --git a/src/Tizen.NUI/src/public/Actor.cs b/src/Tizen.NUI/src/public/Actor.cs index 51f57c4..8237489 100755 --- a/src/Tizen.NUI/src/public/Actor.cs +++ b/src/Tizen.NUI/src/public/Actor.cs @@ -1094,7 +1094,7 @@ namespace Tizen.NUI return ret; } - internal float GetRelayoutSize(DimensionType dimension) + public float GetRelayoutSize(DimensionType dimension) { float ret = NDalicPINVOKE.Actor_GetRelayoutSize(swigCPtr, (int)dimension); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/src/Tizen.NUI/src/public/CustomView.cs b/src/Tizen.NUI/src/public/CustomView.cs index 3a85b1f..020b57e 100755 --- a/src/Tizen.NUI/src/public/CustomView.cs +++ b/src/Tizen.NUI/src/public/CustomView.cs @@ -64,6 +64,9 @@ namespace Tizen.NUI viewWrapperImpl.OnTap = new ViewWrapperImpl.OnTapDelegate(OnTap); viewWrapperImpl.OnLongPress = new ViewWrapperImpl.OnLongPressDelegate(OnLongPress); + // By default, we do not want the position to use the anchor point + this.PositionUsesAnchorPoint = false; + // Make sure CustomView is initialized. OnInitialize(); @@ -91,7 +94,7 @@ namespace Tizen.NUI * @endcode * @param[in] type The gesture type(s) to enable. */ - internal void EnableGestureDetection(Gesture.GestureType type) + public void EnableGestureDetection(Gesture.GestureType type) { viewWrapperImpl.EnableGestureDetection(type); } @@ -815,7 +818,7 @@ namespace Tizen.NUI * @note Tap detection should be enabled via EnableGestureDetection(). * @see EnableGestureDetection */ - internal virtual void OnTap(TapGesture tap) + public virtual void OnTap(TapGesture tap) { } diff --git a/src/Tizen.NUI/src/public/VisualMaps.cs b/src/Tizen.NUI/src/public/VisualMaps.cs index 68fd46b..5b92c74 100755 --- a/src/Tizen.NUI/src/public/VisualMaps.cs +++ b/src/Tizen.NUI/src/public/VisualMaps.cs @@ -25,7 +25,8 @@ namespace Tizen.NUI { private Vector2 _visualSize = Vector2.Zero; private Vector2 _visualOffset = Vector2.Zero; - private Vector4 _visualOffsetSizeMode = new Vector4(1.0f, 1.0f, 1.0f, 1.0f); // default absolute + private Vector2 _visualOffsetPolicy = new Vector2((int)VisualTransformPolicyType.ABSOLUTE, (int)VisualTransformPolicyType.ABSOLUTE); // default absolute + private Vector2 _visualSizePolicy = new Vector2((int)VisualTransformPolicyType.ABSOLUTE, (int)VisualTransformPolicyType.ABSOLUTE); // default absolute private AlignType _visualOrigin = AlignType.TOP_BEGIN; private AlignType _visualAnchorPoint = AlignType.TOP_BEGIN; @@ -73,20 +74,38 @@ namespace Tizen.NUI } /// - /// Get or set offset/size mode of the visual. - /// Indicates which components of the offset and size are relative + /// Get or set offset policy of the visual. + /// Indicates which components of the offset are relative /// (percentage of the parent) or absolute (in world units). /// 0 indicates the component is relative, and 1 absolute. /// - public Vector4 OffsetSizeMode + public Vector2 OffsetPolicy { get { - return _visualOffsetSizeMode; + return _visualOffsetPolicy; } set { - _visualOffsetSizeMode = value; + _visualOffsetPolicy = value; + } + } + + /// + /// Get or set size policy of the visual. + /// Indicates which components of the size are relative + /// (percentage of the parent) or absolute (in world units). + /// 0 indicates the component is relative, and 1 absolute. + /// + public Vector2 SizePolicy + { + get + { + return _visualSizePolicy; + } + set + { + _visualSizePolicy = value; } } @@ -142,7 +161,8 @@ namespace Tizen.NUI _visualTransformMap = new PropertyMap(); _visualTransformMap.Add((int)VisualTransformPropertyType.SIZE, new PropertyValue(_visualSize)); _visualTransformMap.Add((int)VisualTransformPropertyType.OFFSET, new PropertyValue(_visualOffset)); - _visualTransformMap.Add((int)VisualTransformPropertyType.OFFSET_SIZE_MODE, new PropertyValue(_visualOffsetSizeMode)); + _visualTransformMap.Add((int)VisualTransformPropertyType.OFFSET_POLICY, new PropertyValue(_visualOffsetPolicy)); + _visualTransformMap.Add((int)VisualTransformPropertyType.SIZE_POLICY, new PropertyValue(_visualSizePolicy)); _visualTransformMap.Add((int)VisualTransformPropertyType.ORIGIN, new PropertyValue((int)_visualOrigin)); _visualTransformMap.Add((int)VisualTransformPropertyType.ANCHOR_POINT, new PropertyValue((int)_visualAnchorPoint)); } -- 2.7.4