From 57b012622c340785643c485e210bbea9dfc32cb0 Mon Sep 17 00:00:00 2001 From: "dongsug.song" Date: Fri, 14 Apr 2017 21:46:43 +0900 Subject: [PATCH] PositionUseAnchorPoint sample app changed, static get property setting Change-Id: I7a6868a9bfd3d35a527b590aaeeec2d6ccd4149d Signed-off-by: dongsug.song --- src/Tizen.NUI/src/internal/DaliEnumConstants.cs | 5 - src/Tizen.NUI/src/public/CustomView/Spin.cs | 8 +- src/Tizen.NUI/src/public/Position.cs | 368 +++++++++++++++++++++--- src/Tizen.NUI/src/public/Rectangle.cs | 27 +- src/Tizen.NUI/src/public/TextEditor.cs | 16 +- src/Tizen.NUI/src/public/TextField.cs | 32 +-- src/Tizen.NUI/src/public/TextLabel.cs | 32 +-- src/Tizen.NUI/src/public/View.cs | 3 +- src/Tizen.NUI/src/public/VisualMaps.cs | 32 +-- 9 files changed, 398 insertions(+), 125 deletions(-) diff --git a/src/Tizen.NUI/src/internal/DaliEnumConstants.cs b/src/Tizen.NUI/src/internal/DaliEnumConstants.cs index 9877386..7b56c45 100755 --- a/src/Tizen.NUI/src/internal/DaliEnumConstants.cs +++ b/src/Tizen.NUI/src/internal/DaliEnumConstants.cs @@ -74,9 +74,4 @@ namespace Tizen.NUI } } } // namespace Constants - - public struct InternalSetting - { - public static bool DefaultParentOriginAsTopLeft = true; - } } // namesapce Dali diff --git a/src/Tizen.NUI/src/public/CustomView/Spin.cs b/src/Tizen.NUI/src/public/CustomView/Spin.cs index 1cb374d..1ab37b2 100755 --- a/src/Tizen.NUI/src/public/CustomView/Spin.cs +++ b/src/Tizen.NUI/src/public/CustomView/Spin.cs @@ -54,8 +54,6 @@ namespace Tizen.NUI // static constructor registers the control type (only runs once) static Spin() { - InternalSetting.DefaultParentOriginAsTopLeft = false; - // ViewRegistry registers control type with DALi type registery // also uses introspection to find any properties that need to be registered with type registry ViewRegistry.Instance.Register(CreateInstance, typeof(Spin)); @@ -91,17 +89,17 @@ namespace Tizen.NUI // Create a text field _textField = new TextField(); - _textField.ParentOrigin = Tizen.NUI.ParentOrigin.Center; _textField.AnchorPoint = Tizen.NUI.AnchorPoint.Center; _textField.WidthResizePolicy = ResizePolicyType.SizeRelativeToParent; _textField.HeightResizePolicy = ResizePolicyType.SizeRelativeToParent; _textField.SizeModeFactor = new Vector3(1.0f, 0.45f, 1.0f); _textField.PlaceholderText = "----"; _textField.BackgroundColor = _textBackgroundColor; - _textField.HorizontalAlignment = Tizen.NUI.Constants.HorizontalAlignment.HorizontalAlignCenter; - _textField.VerticalAlignment = Tizen.NUI.Constants.VerticalAlignment.VerticalAlignCenter; + _textField.HorizontalAlignment = HorizontalAlignment.HorizontalAlignCenter; + _textField.VerticalAlignment = VerticalAlignment.VerticalAlignCenter; _textField.Focusable = (true); _textField.Name = "_textField"; + _textField.Position2D = new Position2D(0, 40); this.Add(_textField); diff --git a/src/Tizen.NUI/src/public/Position.cs b/src/Tizen.NUI/src/public/Position.cs index 24e9160..112bbd3 100755 --- a/src/Tizen.NUI/src/public/Position.cs +++ b/src/Tizen.NUI/src/public/Position.cs @@ -830,20 +830,141 @@ namespace Tizen.NUI /// public struct ParentOrigin { - public static readonly float Top = Position.ParentOriginTop; - public static readonly float Bottom = Position.ParentOriginBottom; - public static readonly float Left = Position.ParentOriginLeft; - public static readonly float Right = Position.ParentOriginRight; - public static readonly float Middle = Position.ParentOriginMiddle; - public static readonly Position TopLeft = Position.ParentOriginTopLeft; - public static readonly Position TopCenter = Position.ParentOriginTopCenter; - public static readonly Position TopRight = Position.ParentOriginTopRight; - public static readonly Position CenterLeft = Position.ParentOriginCenterLeft; - public static readonly Position Center = Position.ParentOriginCenter; - public static readonly Position CenterRight = Position.ParentOriginCenterRight; - public static readonly Position BottomLeft = Position.ParentOriginBottomLeft; - public static readonly Position BottomCenter = Position.ParentOriginBottomCenter; - public static readonly Position BottomRight = Position.ParentOriginBottomRight; + public static float Top + { + get + { + float ret = NDalicPINVOKE.ParentOriginTop_get(); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static float Bottom + { + get + { + float ret = NDalicPINVOKE.ParentOriginBottom_get(); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static float Left + { + get + { + float ret = NDalicPINVOKE.ParentOriginLeft_get(); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static float Right + { + get + { + float ret = NDalicPINVOKE.ParentOriginRight_get(); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static float Middle + { + get + { + float ret = NDalicPINVOKE.ParentOriginMiddle_get(); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static Position TopLeft + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginTopLeft_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static Position TopCenter + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginTopCenter_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static Position TopRight + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginTopRight_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static Position CenterLeft + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginCenterLeft_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static Position Center + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginCenter_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static Position CenterRight + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginCenterRight_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static Position BottomLeft + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginBottomLeft_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static Position BottomCenter + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginBottomCenter_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static Position BottomRight + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginBottomRight_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } } /// @@ -851,35 +972,206 @@ namespace Tizen.NUI /// public struct AnchorPoint { - public static readonly float Top = Position.AnchorPointTop; - public static readonly float Bottom = Position.AnchorPointBottom; - public static readonly float Left = Position.AnchorPointLeft; - public static readonly float Right = Position.AnchorPointRight; - public static readonly float Middle = Position.AnchorPointMiddle; - public static readonly Position TopLeft = Position.AnchorPointTopLeft; - public static readonly Position TopCenter = Position.AnchorPointTopCenter; - public static readonly Position TopRight = Position.AnchorPointTopRight; - public static readonly Position CenterLeft = Position.AnchorPointCenterLeft; - public static readonly Position Center = Position.AnchorPointCenter; - public static readonly Position CenterRight = Position.AnchorPointCenterRight; - public static readonly Position BottomLeft = Position.AnchorPointBottomLeft; - public static readonly Position BottomCenter = Position.AnchorPointBottomCenter; - public static readonly Position BottomRight = Position.AnchorPointBottomRight; + public static float Top + { + get + { + float ret = NDalicPINVOKE.AnchorPointTop_get(); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static float Bottom + { + get + { + float ret = NDalicPINVOKE.AnchorPointBottom_get(); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static float Left + { + get + { + float ret = NDalicPINVOKE.AnchorPointLeft_get(); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static float Right + { + get + { + float ret = NDalicPINVOKE.AnchorPointRight_get(); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static float Middle + { + get + { + float ret = NDalicPINVOKE.AnchorPointMiddle_get(); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static Position TopLeft + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointTopLeft_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static Position TopCenter + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointTopCenter_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static Position TopRight + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointTopRight_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static Position CenterLeft + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointCenterLeft_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static Position Center + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointCenter_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static Position CenterRight + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointCenterRight_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static Position BottomLeft + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointBottomLeft_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static Position BottomCenter + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointBottomCenter_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static Position BottomRight + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointBottomRight_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } } - /// /// PositionAxis constants. /// public struct PositionAxis { - public static readonly Position X = Position.XAxis; - public static readonly Position Y = Position.YAxis; - public static readonly Position Z = Position.ZAxis; - public static readonly Position NegativeX = Position.NegativeXAxis; - public static readonly Position NegativeY = Position.NegativeYAxis; - public static readonly Position NegativeZ = Position.NegativeZAxis; + public static Position X + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_XAXIS_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static Position Y + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_YAXIS_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static Position Z + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_ZAXIS_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static Position NegativeX + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_NEGATIVE_XAXIS_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static Position NegativeY + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_NEGATIVE_YAXIS_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public static Position NegativeZ + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_NEGATIVE_ZAXIS_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } } - } - - diff --git a/src/Tizen.NUI/src/public/Rectangle.cs b/src/Tizen.NUI/src/public/Rectangle.cs index 5216099..ff0214c 100755 --- a/src/Tizen.NUI/src/public/Rectangle.cs +++ b/src/Tizen.NUI/src/public/Rectangle.cs @@ -59,17 +59,6 @@ namespace Tizen.NUI } /// - /// Constructor - /// - /// position in x coordinate - /// position in y coordinate - /// Width of the rectangle - /// Height of the rectangle - public Rectangle(float x, float y, float width, float height) : this( (int)x, (int)y, (int)width, (int)height ) - { - } - - /// /// Equality operator. /// /// First operand @@ -107,11 +96,11 @@ namespace Tizen.NUI /// /// X position of the rectangle /// - public float X + public int X { set { - x = (int)( value ); + x = ( value ); } get { @@ -122,11 +111,11 @@ namespace Tizen.NUI /// /// Y position of the rectangle /// - public float Y + public int Y { set { - y = (int)( value ); + y = ( value ); } get { @@ -137,11 +126,11 @@ namespace Tizen.NUI /// /// Width of the rectangle /// - public float Width + public int Width { set { - width = (int)( value ); + width = ( value ); } get { @@ -152,11 +141,11 @@ namespace Tizen.NUI /// /// Height of the rectangle /// - public float Height + public int Height { set { - height = (int)( value ); + height = ( value ); } get { diff --git a/src/Tizen.NUI/src/public/TextEditor.cs b/src/Tizen.NUI/src/public/TextEditor.cs index a9e78b9..f8ad801 100755 --- a/src/Tizen.NUI/src/public/TextEditor.cs +++ b/src/Tizen.NUI/src/public/TextEditor.cs @@ -459,7 +459,7 @@ namespace Tizen.NUI /// /// Horizontal alignment property. /// - public Tizen.NUI.Constants.HorizontalAlignment HorizontalAlignment + public HorizontalAlignment HorizontalAlignment { get { @@ -472,13 +472,13 @@ namespace Tizen.NUI switch (temp) { case "BEGIN": - return Tizen.NUI.Constants.HorizontalAlignment.HorizontalAlignBegin; + return HorizontalAlignment.HorizontalAlignBegin; case "CENTER": - return Tizen.NUI.Constants.HorizontalAlignment.HorizontalAlignCenter; + return HorizontalAlignment.HorizontalAlignCenter; case "END": - return Tizen.NUI.Constants.HorizontalAlignment.HorizontalAlignEnd; + return HorizontalAlignment.HorizontalAlignEnd; default: - return Tizen.NUI.Constants.HorizontalAlignment.HorizontalAlignBegin; + return HorizontalAlignment.HorizontalAlignBegin; } } set @@ -486,17 +486,17 @@ namespace Tizen.NUI string valueToString = ""; switch (value) { - case Tizen.NUI.Constants.HorizontalAlignment.HorizontalAlignBegin: + case HorizontalAlignment.HorizontalAlignBegin: { valueToString = "BEGIN"; break; } - case Tizen.NUI.Constants.HorizontalAlignment.HorizontalAlignCenter: + case HorizontalAlignment.HorizontalAlignCenter: { valueToString = "CENTER"; break; } - case Tizen.NUI.Constants.HorizontalAlignment.HorizontalAlignEnd: + case HorizontalAlignment.HorizontalAlignEnd: { valueToString = "END"; break; diff --git a/src/Tizen.NUI/src/public/TextField.cs b/src/Tizen.NUI/src/public/TextField.cs index 6bfe9d8..b80c4dc 100755 --- a/src/Tizen.NUI/src/public/TextField.cs +++ b/src/Tizen.NUI/src/public/TextField.cs @@ -594,7 +594,7 @@ namespace Tizen.NUI /// /// HorizontalAlignment property. /// - public Tizen.NUI.Constants.HorizontalAlignment HorizontalAlignment + public HorizontalAlignment HorizontalAlignment { get { @@ -607,13 +607,13 @@ namespace Tizen.NUI switch (temp) { case "BEGIN": - return Tizen.NUI.Constants.HorizontalAlignment.HorizontalAlignBegin; + return HorizontalAlignment.HorizontalAlignBegin; case "CENTER": - return Tizen.NUI.Constants.HorizontalAlignment.HorizontalAlignCenter; + return HorizontalAlignment.HorizontalAlignCenter; case "END": - return Tizen.NUI.Constants.HorizontalAlignment.HorizontalAlignEnd; + return HorizontalAlignment.HorizontalAlignEnd; default: - return Tizen.NUI.Constants.HorizontalAlignment.HorizontalAlignBegin; + return HorizontalAlignment.HorizontalAlignBegin; } } set @@ -621,17 +621,17 @@ namespace Tizen.NUI string valueToString = ""; switch (value) { - case Tizen.NUI.Constants.HorizontalAlignment.HorizontalAlignBegin: + case HorizontalAlignment.HorizontalAlignBegin: { valueToString = "BEGIN"; break; } - case Tizen.NUI.Constants.HorizontalAlignment.HorizontalAlignCenter: + case HorizontalAlignment.HorizontalAlignCenter: { valueToString = "CENTER"; break; } - case Tizen.NUI.Constants.HorizontalAlignment.HorizontalAlignEnd: + case HorizontalAlignment.HorizontalAlignEnd: { valueToString = "END"; break; @@ -649,7 +649,7 @@ namespace Tizen.NUI /// /// VerticalAlignment property. /// - public Tizen.NUI.Constants.VerticalAlignment VerticalAlignment + public VerticalAlignment VerticalAlignment { get { @@ -662,13 +662,13 @@ namespace Tizen.NUI switch (temp) { case "TOP": - return Tizen.NUI.Constants.VerticalAlignment.VerticalAlignTop; + return VerticalAlignment.VerticalAlignTop; case "CENTER": - return Tizen.NUI.Constants.VerticalAlignment.VerticalAlignCenter; + return VerticalAlignment.VerticalAlignCenter; case "BOTTOM": - return Tizen.NUI.Constants.VerticalAlignment.VerticalAlignBottom; + return VerticalAlignment.VerticalAlignBottom; default: - return Tizen.NUI.Constants.VerticalAlignment.VerticalAlignBottom; + return VerticalAlignment.VerticalAlignBottom; } } set @@ -676,17 +676,17 @@ namespace Tizen.NUI string valueToString = ""; switch (value) { - case Tizen.NUI.Constants.VerticalAlignment.VerticalAlignTop: + case VerticalAlignment.VerticalAlignTop: { valueToString = "TOP"; break; } - case Tizen.NUI.Constants.VerticalAlignment.VerticalAlignCenter: + case VerticalAlignment.VerticalAlignCenter: { valueToString = "CENTER"; break; } - case Tizen.NUI.Constants.VerticalAlignment.VerticalAlignBottom: + case VerticalAlignment.VerticalAlignBottom: { valueToString = "BOTTOM"; break; diff --git a/src/Tizen.NUI/src/public/TextLabel.cs b/src/Tizen.NUI/src/public/TextLabel.cs index adf4d72..834fbe0 100755 --- a/src/Tizen.NUI/src/public/TextLabel.cs +++ b/src/Tizen.NUI/src/public/TextLabel.cs @@ -307,7 +307,7 @@ namespace Tizen.NUI /// HorizontalAlignment property.
/// The line horizontal alignment.
/// - public Tizen.NUI.Constants.HorizontalAlignment HorizontalAlignment + public HorizontalAlignment HorizontalAlignment { get { @@ -319,13 +319,13 @@ namespace Tizen.NUI switch (temp) { case "BEGIN": - return Tizen.NUI.Constants.HorizontalAlignment.HorizontalAlignBegin; + return HorizontalAlignment.HorizontalAlignBegin; case "CENTER": - return Tizen.NUI.Constants.HorizontalAlignment.HorizontalAlignCenter; + return HorizontalAlignment.HorizontalAlignCenter; case "END": - return Tizen.NUI.Constants.HorizontalAlignment.HorizontalAlignEnd; + return HorizontalAlignment.HorizontalAlignEnd; default: - return Tizen.NUI.Constants.HorizontalAlignment.HorizontalAlignBegin; + return HorizontalAlignment.HorizontalAlignBegin; } } set @@ -333,17 +333,17 @@ namespace Tizen.NUI string valueToString = ""; switch (value) { - case Tizen.NUI.Constants.HorizontalAlignment.HorizontalAlignBegin: + case HorizontalAlignment.HorizontalAlignBegin: { valueToString = "BEGIN"; break; } - case Tizen.NUI.Constants.HorizontalAlignment.HorizontalAlignCenter: + case HorizontalAlignment.HorizontalAlignCenter: { valueToString = "CENTER"; break; } - case Tizen.NUI.Constants.HorizontalAlignment.HorizontalAlignEnd: + case HorizontalAlignment.HorizontalAlignEnd: { valueToString = "END"; break; @@ -362,7 +362,7 @@ namespace Tizen.NUI /// VerticalAlignment property.
/// The line vertical alignment.
/// - public Tizen.NUI.Constants.VerticalAlignment VerticalAlignment + public VerticalAlignment VerticalAlignment { get { @@ -375,13 +375,13 @@ namespace Tizen.NUI switch (temp) { case "TOP": - return Tizen.NUI.Constants.VerticalAlignment.VerticalAlignTop; + return VerticalAlignment.VerticalAlignTop; case "CENTER": - return Tizen.NUI.Constants.VerticalAlignment.VerticalAlignCenter; + return VerticalAlignment.VerticalAlignCenter; case "BOTTOM": - return Tizen.NUI.Constants.VerticalAlignment.VerticalAlignBottom; + return VerticalAlignment.VerticalAlignBottom; default: - return Tizen.NUI.Constants.VerticalAlignment.VerticalAlignBottom; + return VerticalAlignment.VerticalAlignBottom; } } set @@ -389,17 +389,17 @@ namespace Tizen.NUI string valueToString = ""; switch (value) { - case Tizen.NUI.Constants.VerticalAlignment.VerticalAlignTop: + case VerticalAlignment.VerticalAlignTop: { valueToString = "TOP"; break; } - case Tizen.NUI.Constants.VerticalAlignment.VerticalAlignCenter: + case VerticalAlignment.VerticalAlignCenter: { valueToString = "CENTER"; break; } - case Tizen.NUI.Constants.VerticalAlignment.VerticalAlignBottom: + case VerticalAlignment.VerticalAlignBottom: { valueToString = "BOTTOM"; break; diff --git a/src/Tizen.NUI/src/public/View.cs b/src/Tizen.NUI/src/public/View.cs index dc1eff7..b6e12c1 100755 --- a/src/Tizen.NUI/src/public/View.cs +++ b/src/Tizen.NUI/src/public/View.cs @@ -35,8 +35,7 @@ namespace Tizen.NUI ViewRegistry.RegisterView(this); // By default, we do not want the position to use the anchor point - //this.PositionUsesAnchorPoint = false; - this.PositionUsesAnchorPoint = !(InternalSetting.DefaultParentOriginAsTopLeft); + this.PositionUsesAnchorPoint = false; } internal static global::System.Runtime.InteropServices.HandleRef getCPtr(View obj) diff --git a/src/Tizen.NUI/src/public/VisualMaps.cs b/src/Tizen.NUI/src/public/VisualMaps.cs index 198c2c2..e3b35b6 100755 --- a/src/Tizen.NUI/src/public/VisualMaps.cs +++ b/src/Tizen.NUI/src/public/VisualMaps.cs @@ -628,37 +628,37 @@ namespace Tizen.NUI /// Get or set the line horizontal alignment.
/// If not specified, the default is BEGIN.
/// - public Tizen.NUI.Constants.HorizontalAlignment HorizontalAlignment + public HorizontalAlignment HorizontalAlignment { get { switch (_horizontalAlignment) { case "BEGIN": - return Tizen.NUI.Constants.HorizontalAlignment.HorizontalAlignBegin; + return HorizontalAlignment.HorizontalAlignBegin; case "CENTER": - return Tizen.NUI.Constants.HorizontalAlignment.HorizontalAlignCenter; + return HorizontalAlignment.HorizontalAlignCenter; case "END": - return Tizen.NUI.Constants.HorizontalAlignment.HorizontalAlignEnd; + return HorizontalAlignment.HorizontalAlignEnd; default: - return Tizen.NUI.Constants.HorizontalAlignment.HorizontalAlignBegin; + return HorizontalAlignment.HorizontalAlignBegin; } } set { switch (value) { - case Tizen.NUI.Constants.HorizontalAlignment.HorizontalAlignBegin: + case HorizontalAlignment.HorizontalAlignBegin: { _horizontalAlignment = "BEGIN"; break; } - case Tizen.NUI.Constants.HorizontalAlignment.HorizontalAlignCenter: + case HorizontalAlignment.HorizontalAlignCenter: { _horizontalAlignment = "CENTER"; break; } - case Tizen.NUI.Constants.HorizontalAlignment.HorizontalAlignEnd: + case HorizontalAlignment.HorizontalAlignEnd: { _horizontalAlignment = "END"; break; @@ -677,37 +677,37 @@ namespace Tizen.NUI /// Get or set the line vertical alignment.
/// If not specified, the default is TOP.
/// - public Tizen.NUI.Constants.VerticalAlignment VerticalAlignment + public VerticalAlignment VerticalAlignment { get { switch (_verticalAlignment) { case "TOP": - return Tizen.NUI.Constants.VerticalAlignment.VerticalAlignTop; + return VerticalAlignment.VerticalAlignTop; case "CENTER": - return Tizen.NUI.Constants.VerticalAlignment.VerticalAlignCenter; + return VerticalAlignment.VerticalAlignCenter; case "BOTTOM": - return Tizen.NUI.Constants.VerticalAlignment.VerticalAlignBottom; + return VerticalAlignment.VerticalAlignBottom; default: - return Tizen.NUI.Constants.VerticalAlignment.VerticalAlignBottom; + return VerticalAlignment.VerticalAlignBottom; } } set { switch (value) { - case Tizen.NUI.Constants.VerticalAlignment.VerticalAlignTop: + case VerticalAlignment.VerticalAlignTop: { _verticalAlignment = "TOP"; break; } - case Tizen.NUI.Constants.VerticalAlignment.VerticalAlignCenter: + case VerticalAlignment.VerticalAlignCenter: { _verticalAlignment = "CENTER"; break; } - case Tizen.NUI.Constants.VerticalAlignment.VerticalAlignBottom: + case VerticalAlignment.VerticalAlignBottom: { _verticalAlignment = "BOTTOM"; break; -- 2.7.4