Merge "Hide Size, and use Size2D instead." into devel/master

diff --git a/src/Tizen.NUI/Tizen.NUI.csproj b/src/Tizen.NUI/Tizen.NUI.csproj
index 55f6438..74346a4 100755 (executable)
--- a/src/Tizen.NUI/Tizen.NUI.csproj
+++ b/src/Tizen.NUI/Tizen.NUI.csproj
@@ -50,10 +50,8 @@
     <Compile Include="src\internal\AccessibilityFocusOvershotSignal.cs" />\r
     <Compile Include="src\internal\AccessibilityManager.cs" />\r
     <Compile Include="src\internal\Alignment.cs" />\r
-    <Compile Include="src\internal\AlignType.cs" />\r
     <Compile Include="src\internal\AngleAxis.cs" />\r
     <Compile Include="src\internal\AngleThresholdPair.cs" />\r
-    <Compile Include="src\internal\Animatable.cs" />\r
     <Compile Include="src\internal\AnimatablePropertyComponentRegistration.cs" />\r
     <Compile Include="src\internal\AnimatablePropertyRegistration.cs" />\r
     <Compile Include="src\internal\AnimationSignal.cs" />\r
@@ -63,23 +61,18 @@
     <Compile Include="src\internal\ApplicationExtensions.cs" />\r
     <Compile Include="src\internal\ApplicationSignal.cs" />\r
     <Compile Include="src\internal\AsyncImageLoader.cs" />\r
-    <Compile Include="src\internal\BaseHandle.cs" />\r
     <Compile Include="src\internal\BaseObject.cs" />\r
     <Compile Include="src\internal\BlendEquationType.cs" />\r
     <Compile Include="src\internal\BlendFactorType.cs" />\r
     <Compile Include="src\internal\BlendModeType.cs" />\r
     <Compile Include="src\internal\BufferImage.cs" />\r
     <Compile Include="src\internal\Builder.cs" />\r
-    <Compile Include="src\internal\Button.cs" />\r
     <Compile Include="src\internal\ButtonSignal.cs" />\r
     <Compile Include="src\internal\Camera.cs" />\r
     <Compile Include="src\internal\ChildPropertyRegistration.cs" />\r
-    <Compile Include="src\internal\ClampState.cs" />\r
-    <Compile Include="src\internal\ClampState2D.cs" />\r
     <Compile Include="src\internal\ConnectionTracker.cs" />\r
     <Compile Include="src\internal\ConnectionTrackerInterface.cs" />\r
     <Compile Include="src\internal\ControlKeySignal.cs" />\r
-    <Compile Include="src\internal\ControlOrientationType.cs" />\r
     <Compile Include="src\internal\CustomActor.cs" />\r
     <Compile Include="src\internal\CustomActorImpl.cs" />\r
     <Compile Include="src\internal\CustomAlgorithmInterface.cs" />\r
@@ -92,7 +85,6 @@
     <Compile Include="src\internal\DepthFunctionType.cs" />\r
     <Compile Include="src\internal\DepthTestModeType.cs" />\r
     <Compile Include="src\internal\DepthWriteModeType.cs" />\r
-    <Compile Include="src\internal\DirectionBias.cs" />\r
     <Compile Include="src\internal\DirectionType.cs" />\r
     <Compile Include="src\internal\DisposeQueue.cs" />\r
     <Compile Include="src\internal\dotnetcore\AddedException.cs" />\r
@@ -126,7 +118,6 @@
     <Compile Include="src\internal\ItemLayout.cs" />\r
     <Compile Include="src\internal\ItemRange.cs" />\r
     <Compile Include="src\internal\ItemView.cs" />\r
-    <Compile Include="src\internal\KeyboardPreFocusChangeSignal.cs" />\r
     <Compile Include="src\internal\KeyEventSignal.cs" />\r
     <Compile Include="src\internal\KeyInputFocusManager.cs" />\r
     <Compile Include="src\internal\KeyInputFocusSignal.cs" />\r
@@ -137,7 +128,6 @@
     <Compile Include="src\internal\ManualPINVOKE.cs" />\r
     <Compile Include="src\internal\Matrix.cs" />\r
     <Compile Include="src\internal\Matrix3.cs" />\r
-    <Compile Include="src\internal\Meta.cs" />\r
     <Compile Include="src\internal\Model3dView.cs" />\r
     <Compile Include="src\internal\NativeImage.cs" />\r
     <Compile Include="src\internal\NativeImageInterface.cs" />\r
@@ -148,7 +138,6 @@
     <Compile Include="src\internal\ObjectCreatedSignal.cs" />\r
     <Compile Include="src\internal\ObjectDestroyedSignal.cs" />\r
     <Compile Include="src\internal\ObjectRegistry.cs" />\r
-    <Compile Include="src\internal\PaddingType.cs" />\r
     <Compile Include="src\internal\PageFactory.cs" />\r
     <Compile Include="src\internal\PagePanSignal.cs" />\r
     <Compile Include="src\internal\PageTurnLandscapeView.cs" />\r
@@ -162,9 +151,7 @@
     <Compile Include="src\internal\PinchGestureDetector.cs" />\r
     <Compile Include="src\internal\PixelData.cs" />\r
     <Compile Include="src\internal\PixelFormat.cs" />\r
-    <Compile Include="src\internal\Popup.cs" />\r
-    <Compile Include="src\internal\PositionInheritanceMode.cs" />\r
-    <Compile Include="src\internal\ProgressBar.cs" />\r
+    <Compile Include="src\internal\PreFocusChangeSignal.cs" />\r
     <Compile Include="src\internal\ProgressBarValueChangedSignal.cs" />\r
     <Compile Include="src\internal\PropertyBuffer.cs" />\r
     <Compile Include="src\internal\PropertyCondition.cs" />\r
@@ -173,7 +160,6 @@
     <Compile Include="src\internal\PropertyRangeManager.cs" />\r
     <Compile Include="src\internal\PropertyRanges.cs" />\r
     <Compile Include="src\internal\PropertyRegistration.cs" />\r
-    <Compile Include="src\internal\RadioButton.cs" />\r
     <Compile Include="src\internal\RefObject.cs" />\r
     <Compile Include="src\internal\RenderBufferFormat.cs" />\r
     <Compile Include="src\internal\Renderer.cs" />\r
@@ -188,10 +174,7 @@
     <Compile Include="src\internal\RulerDomain.cs" />\r
     <Compile Include="src\internal\RulerPtr.cs" />\r
     <Compile Include="src\internal\Sampler.cs" />\r
-    <Compile Include="src\internal\Scrollable.cs" />\r
     <Compile Include="src\internal\ScrollableSignal.cs" />\r
-    <Compile Include="src\internal\ScrollView.cs" />\r
-    <Compile Include="src\internal\ScrollViewEffect.cs" />\r
     <Compile Include="src\internal\ScrollViewPagePathEffect.cs" />\r
     <Compile Include="src\internal\ScrollViewSnapStartedSignal.cs" />\r
     <Compile Include="src\internal\Shader.cs" />\r
@@ -263,17 +246,14 @@
     <Compile Include="src\internal\TextureType.cs" />\r
     <Compile Include="src\internal\TimePeriod.cs" />\r
     <Compile Include="src\internal\TimerSignalType.cs" />\r
-    <Compile Include="src\internal\ToggleButton.cs" />\r
     <Compile Include="src\internal\ToolkitPropertyRange.cs" />\r
     <Compile Include="src\internal\TooltipPositionType.cs" />\r
     <Compile Include="src\internal\TouchDataSignal.cs" />\r
     <Compile Include="src\internal\TouchPoint.cs" />\r
     <Compile Include="src\internal\TouchPointContainer.cs" />\r
     <Compile Include="src\internal\TouchSignal.cs" />\r
-    <Compile Include="src\internal\TransitionData.cs" />\r
     <Compile Include="src\internal\Type.cs" />\r
     <Compile Include="src\internal\TypeAction.cs" />\r
-    <Compile Include="src\internal\TypeInfo.cs" />\r
     <Compile Include="src\internal\TypeRegistration.cs" />\r
     <Compile Include="src\internal\TypeRegistry.cs" />\r
     <Compile Include="src\internal\Uint16Pair.cs" />\r
@@ -281,30 +261,28 @@
     <Compile Include="src\internal\uintp.cs" />\r
     <Compile Include="src\internal\ushortp.cs" />\r
     <Compile Include="src\internal\VectorBase.cs" />\r
-    <Compile Include="src\internal\VectorFloat.cs" />\r
-    <Compile Include="src\internal\VectorInteger.cs" />\r
     <Compile Include="src\internal\VectorUint16Pair.cs" />\r
     <Compile Include="src\internal\VectorUnsignedChar.cs" />\r
     <Compile Include="src\internal\VideoViewSignal.cs" />\r
-    <Compile Include="src\internal\ViewContainer.cs" />\r
     <Compile Include="src\internal\ViewImpl.cs" />\r
     <Compile Include="src\internal\ViewMode.cs" />\r
     <Compile Include="src\internal\ViewRegistry.cs" />\r
     <Compile Include="src\internal\ViewResourceReadySignal.cs" />\r
     <Compile Include="src\internal\ViewSignal.cs" />\r
     <Compile Include="src\internal\ViewVisibilityChangedSignal.cs" />\r
-    <Compile Include="src\internal\ViewWrapper.cs" />\r
     <Compile Include="src\internal\ViewWrapperImpl.cs" />\r
-    <Compile Include="src\internal\VisibilityChangeType.cs" />\r
-    <Compile Include="src\internal\VisualType.cs" />\r
     <Compile Include="src\internal\WheelSignal.cs" />\r
     <Compile Include="src\internal\WindowFocusSignalType.cs" />\r
     <Compile Include="src\internal\VoidSignal.cs" />\r
     <Compile Include="src\public\AlphaFunction.cs" />\r
+    <Compile Include="src\public\Animatable.cs" />\r
     <Compile Include="src\public\Animation.cs" />\r
+    <Compile Include="src\public\BaseComponents\VisibilityChangeType.cs" />\r
+    <Compile Include="src\public\BaseHandle.cs" />\r
     <Compile Include="src\public\Color.cs" />\r
     <Compile Include="src\public\CustomView\Spin.cs" />\r
     <Compile Include="src\public\Degree.cs" />\r
+    <Compile Include="src\public\DirectionBias.cs" />\r
     <Compile Include="src\public\FlexContainer.cs" />\r
     <Compile Include="src\public\FocusManager.cs" />\r
     <Compile Include="src\public\Gesture.cs" />\r
@@ -315,11 +293,13 @@
     <Compile Include="src\public\LongPressGesture.cs" />\r
     <Compile Include="src\public\NUIApplication.cs" />\r
     <Compile Include="src\public\NUIConstants.cs" />\r
+    <Compile Include="src\public\PaddingType.cs" />\r
     <Compile Include="src\public\PanGesture.cs" />\r
     <Compile Include="src\public\Path.cs" />\r
     <Compile Include="src\public\PinchGesture.cs" />\r
     <Compile Include="src\public\Position.cs" />\r
     <Compile Include="src\public\Position2D.cs" />\r
+    <Compile Include="src\public\ProgressBar.cs" />\r
     <Compile Include="src\public\Property.cs" />\r
     <Compile Include="src\public\Radian.cs" />\r
     <Compile Include="src\public\Rectangle.cs" />\r
@@ -328,12 +308,15 @@
     <Compile Include="src\public\RelativeVector4.cs" />\r
     <Compile Include="src\public\RelayoutContainer.cs" />\r
     <Compile Include="src\public\Rotation.cs" />\r
+    <Compile Include="src\public\Scrollable.cs" />\r
+    <Compile Include="src\public\ScrollViewEffect.cs" />\r
     <Compile Include="src\public\Size2D.cs" />\r
     <Compile Include="src\public\StyleManager.cs" />\r
     <Compile Include="src\public\TableView.cs" />\r
     <Compile Include="src\public\TapGesture.cs" />\r
     <Compile Include="src\public\Timer.cs" />\r
     <Compile Include="src\public\Touch.cs" />\r
+    <Compile Include="src\public\TransitionData.cs" />\r
     <Compile Include="src\public\TTSPlayer.cs" />\r
     <Compile Include="src\public\BaseComponents\ImageView.cs" />\r
     <Compile Include="src\public\BaseComponents\TextEditor.cs" />\r
@@ -342,22 +325,27 @@
     <Compile Include="src\public\BaseComponents\View.cs" />\r
     <Compile Include="src\public\BaseComponents\CustomView.cs" />\r
     <Compile Include="src\public\BaseComponents\VisualView.cs" />\r
+    <Compile Include="src\public\TypeInfo.cs" />\r
+    <Compile Include="src\public\UIComponents\Button.cs" />\r
     <Compile Include="src\public\UIComponents\CheckBoxButton.cs" />\r
+    <Compile Include="src\public\UIComponents\Popup.cs" />\r
     <Compile Include="src\public\UIComponents\PushButton.cs" />\r
+    <Compile Include="src\public\UIComponents\RadioButton.cs" />\r
     <Compile Include="src\public\UIComponents\ScrollBar.cs" />\r
+    <Compile Include="src\public\UIComponents\ScrollView.cs" />\r
+    <Compile Include="src\public\UIComponents\ToggleButton.cs" />\r
     <Compile Include="src\public\Vector2.cs" />\r
     <Compile Include="src\public\Vector3.cs" />\r
     <Compile Include="src\public\Vector4.cs" />\r
     <Compile Include="src\public\VideoView.cs" />\r
+    <Compile Include="src\public\ViewWrapper.cs" />\r
     <Compile Include="src\public\VisualBase.cs" />\r
     <Compile Include="src\public\VisualFactory.cs" />\r
     <Compile Include="src\public\VisualMaps.cs" />\r
     <Compile Include="src\public\Wheel.cs" />\r
     <Compile Include="src\public\Window.cs" />\r
   </ItemGroup>\r
-  <ItemGroup>\r
-    <Folder Include="Properties\" />\r
-  </ItemGroup>\r
+  <ItemGroup />\r
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.\r
                Other similar extension points exist, see Microsoft.Common.targets.\r

diff --git a/src/Tizen.NUI/src/public/Size.cs b/src/Tizen.NUI/src/internal/Size.cs
similarity index 99%
rename from src/Tizen.NUI/src/public/Size.cs
rename to src/Tizen.NUI/src/internal/Size.cs
index f5a3dc7..c656b01 100755 (executable)
--- a/src/Tizen.NUI/src/public/Size.cs
+++ b/src/Tizen.NUI/src/internal/Size.cs
@@ -21,7 +21,7 @@ namespace Tizen.NUI
     /// <summary>
     /// Three dimensional size
     /// </summary>
-    public class Size : global::System.IDisposable
+    internal class Size : global::System.IDisposable
     {
         private global::System.Runtime.InteropServices.HandleRef swigCPtr;
         protected bool swigCMemOwn;

diff --git a/src/Tizen.NUI/src/internal/ViewWrapperImpl.cs b/src/Tizen.NUI/src/internal/ViewWrapperImpl.cs
index 14ce6ec..81489de 100755 (executable)
--- a/src/Tizen.NUI/src/internal/ViewWrapperImpl.cs
+++ b/src/Tizen.NUI/src/internal/ViewWrapperImpl.cs
@@ -33,7 +33,7 @@ namespace Tizen.NUI
         public delegate bool OnWheelDelegate(Wheel wheel);
         public delegate void OnRelayoutDelegate(Vector2 size, RelayoutContainer container);
         public delegate void OnSetResizePolicyDelegate(ResizePolicyType policy, DimensionType dimension);
-        public delegate Size GetNaturalSizeDelegate();
+        public delegate Size2D GetNaturalSizeDelegate();
         public delegate float CalculateChildSizeDelegate(View child, DimensionType dimension);
         public delegate float GetHeightForWidthDelegate(float width);
         public delegate float GetWidthForHeightDelegate(float height);
@@ -365,7 +365,7 @@ namespace Tizen.NUI
 
         private global::System.IntPtr DirectorGetNaturalSize()
         {
-            return Size.getCPtr(GetNaturalSize()).Handle;
+            return Size2D.getCPtr(GetNaturalSize()).Handle;
         }
 
         private float DirectorCalculateChildSize(global::System.IntPtr child, int dimension)

diff --git a/src/Tizen.NUI/src/public/BaseComponents/CustomView.cs b/src/Tizen.NUI/src/public/BaseComponents/CustomView.cs
old mode 100644 (file)
new mode 100755 (executable)
index dc92c96..5bfe0a6
--- a/src/Tizen.NUI/src/public/BaseComponents/CustomView.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/CustomView.cs
@@ -484,9 +484,9 @@ namespace Tizen.NUI.BaseComponents
         /// Return the natural size of the view.
         /// </summary>
         /// <returns>The view's natural size</returns>
-        public virtual Size GetNaturalSize()
+        public virtual Size2D GetNaturalSize()
         {
-            return new Size(0.0f, 0.0f, 0.0f);
+            return new Size2D(0, 0);
         }
 
         /// <summary>

diff --git a/src/Tizen.NUI/src/public/BaseComponents/View.cs b/src/Tizen.NUI/src/public/BaseComponents/View.cs
index f9f63d6..5ecda10 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/View.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/View.cs
@@ -1591,7 +1591,8 @@ namespace Tizen.NUI.BaseComponents
             {
                 Size temp = new Size(0.0f, 0.0f, 0.0f);
                 GetProperty(View.Property.SIZE).Get(temp);
-                return new Size2D(temp);
+                Size2D size = new Size2D((int)temp.Width, (int)temp.Height);
+                return size;
             }
             set
             {
@@ -1603,7 +1604,7 @@ namespace Tizen.NUI.BaseComponents
         ///  Retrieves the size of the View.<br>
         ///  The coordinates are relative to the View's parent.<br>
         /// </summary>
-        public Size CurrentSize
+        public Size2D CurrentSize
         {
             get
             {
@@ -2082,12 +2083,13 @@ namespace Tizen.NUI.BaseComponents
             return ret;
         }
 
-        internal Size GetCurrentSize()
+        internal Size2D GetCurrentSize()
         {
             Size ret = new Size(NDalicPINVOKE.Actor_GetCurrentSize(swigCPtr), true);
             if (NDalicPINVOKE.SWIGPendingException.Pending)
                 throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
+            Size2D size = new Size2D((int)ret.Width, (int)ret.Height);
+            return size;
         }
 
         internal Vector3 GetNaturalSize()
@@ -2782,25 +2784,6 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// Gets/Sets the size of an view.<br>
-        /// Geometry can be scaled to fit within this area.<br>
-        /// This does not interfere with the views scale factor.<br>
-        /// </summary>
-        public Size Size
-        {
-            get
-            {
-                Size temp = new Size(0.0f, 0.0f, 0.0f);
-                GetProperty(View.Property.SIZE).Get(temp);
-                return temp;
-            }
-            set
-            {
-                SetProperty(View.Property.SIZE, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-
-        /// <summary>
         /// Gets/Sets the size width of an view.
         /// </summary>
         public float SizeWidth

diff --git a/src/Tizen.NUI/src/public/CustomView/Spin.cs b/src/Tizen.NUI/src/public/CustomView/Spin.cs
index d757ad5..f5f71a4 100755 (executable)
--- a/src/Tizen.NUI/src/public/CustomView/Spin.cs
+++ b/src/Tizen.NUI/src/public/CustomView/Spin.cs
@@ -118,9 +118,9 @@ namespace Tizen.NUI
         /// Return the natural size of the actor.<br>
         /// </summary>
         /// <returns> Natural size of this Spin itself</returns>
-        public override Size GetNaturalSize()
+        public override Size2D GetNaturalSize()
         {
-            return new Size(150.0f, 150.0f, 0.0f);
+            return new Size2D(150, 150);
         }
 
         /// <summary>

diff --git a/src/Tizen.NUI/src/public/Property.cs b/src/Tizen.NUI/src/public/Property.cs
index 71879cf..7f61663 100755 (executable)
--- a/src/Tizen.NUI/src/public/Property.cs
+++ b/src/Tizen.NUI/src/public/Property.cs
@@ -1172,15 +1172,6 @@ namespace Tizen.NUI
         }
 
         /// <summary>
-        /// Creates a Size property value.
-        /// </summary>
-        /// <param name="vectorValue">A Size values</param>
-        public PropertyValue(Size vectorValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_5(Size.getCPtr(vectorValue)), true)
-        {
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        /// <summary>
         /// Creates a Position2D property value.
         /// </summary>
         /// <param name="vectorValue">A Position2D values</param>
@@ -1220,17 +1211,6 @@ namespace Tizen.NUI
         }
 
         /// <summary>
-        /// Retrieves a Size2D value.
-        /// </summary>
-        /// <param name="vectorValue"> On return, a Size2D value</param>
-        public bool Get(Size vectorValue)
-        {
-            bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_6(swigCPtr, Size.getCPtr(vectorValue));
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        /// <summary>
         /// Retrieves a Position2D value.
         /// </summary>
         /// <param name="vectorValue"> On return, a Position2D value</param>

diff --git a/src/Tizen.NUI/src/public/Size2D.cs b/src/Tizen.NUI/src/public/Size2D.cs
index 0df0143..82235c2 100755 (executable)
--- a/src/Tizen.NUI/src/public/Size2D.cs
+++ b/src/Tizen.NUI/src/public/Size2D.cs
@@ -225,15 +225,6 @@ namespace Tizen.NUI
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
 
-        /// <summary>
-        /// Constructor.
-        /// </summary>
-        /// <param name="size">Size with x (width), y (height), and z (depth)</param>
-        public Size2D(Size size) : this(NDalicPINVOKE.new_Vector2__SWIG_3(Size.getCPtr(size)), true)
-        {
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
         private Size2D Add(Size2D rhs)
         {
             Size2D ret = new Size2D(NDalicPINVOKE.Vector2_Add(swigCPtr, Size2D.getCPtr(rhs)), true);