Merge remote-tracking branch 'github/master' into tizen
authorTizenAPI-Bot <tizenapi@samsung.com>
Fri, 22 Jun 2018 15:38:49 +0000 (00:38 +0900)
committerTizenAPI-Bot <tizenapi@samsung.com>
Fri, 22 Jun 2018 15:38:49 +0000 (00:38 +0900)
13 files changed:
src/Tizen.Applications.AttachPanel/Tizen.Applications.AttachPanel/AttachPanel.cs
src/Tizen.NUI/src/internal/Layouting/LinearLayout.cs
src/Tizen.NUI/src/internal/ManualPINVOKE.cs
src/Tizen.NUI/src/public/Layer.cs
src/Tizen.NUI/src/public/Window.cs
test/NUITestSample/NUITestSample/examples/layouting/custom-layout-test.cs [new file with mode: 0755]
test/NUITestSample/NUITestSample/examples/layouting/custom-layout-without-absoluteLayout-test.cs [new file with mode: 0755]
test/NUITestSample/NUITestSample/examples/layouting/flex-layout-test.cs [new file with mode: 0755]
test/NUITestSample/NUITestSample/examples/layouting/linear-layout-test.cs [new file with mode: 0755]
test/NUITestSample/NUITestSample/res/images/application-icon-101.png [new file with mode: 0755]
test/NUITestSample/NUITestSample/res/images/application-icon-102.png [new file with mode: 0755]
test/NUITestSample/NUITestSample/res/images/application-icon-103.png [new file with mode: 0755]
test/NUITestSample/NUITestSample/res/images/application-icon-104.png [new file with mode: 0755]

index 13ccd38..488e8dd 100755 (executable)
@@ -145,6 +145,7 @@ namespace Tizen.Applications.AttachPanel
         /// <param name="extraData">The AttachPanel sends some information using the Bundle.</param>
         /// <privilege>http://tizen.org/privilege/mediastorage</privilege>
         /// <privilege>http://tizen.org/privilege/camera</privilege>
+        /// <privilege>http://tizen.org/privilege/telephony</privilege>
         /// <privilege>http://tizen.org/privilege/recorder</privilege>
         /// <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
         /// <feature>http://tizen.org/feature/camera</feature>
@@ -158,6 +159,7 @@ namespace Tizen.Applications.AttachPanel
         /// Privileges,
         /// http://tizen.org/privilege/mediastorage, for using Image or Camera.
         /// http://tizen.org/privilege/camera, for using Camera or TakePicture.
+        /// http://tizen.org/privilege/telephony, for using Camera, Since(5.0).
         /// http://tizen.org/privilege/recorder, for using Voice.
         /// http://tizen.org/privilege/appmanager.launch, for adding content categories on the More tab.
         /// http://tizen.org/feature/camera, for using Camera or TakePicture.
index 0bdc36d..792c33a 100755 (executable)
@@ -62,7 +62,7 @@ namespace Tizen.NUI
                 }
                 swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
             }
-            base.Dispose();
+            base.Dispose(type);
         }
 
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
index be50b6d..526e02c 100755 (executable)
@@ -1276,6 +1276,9 @@ namespace Tizen.NUI
         [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_Adaptor_RenderOnce")]
         public static extern void Window_RenderOnce(global::System.Runtime.InteropServices.HandleRef jarg1);
 
+        [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Window_New_Root_Layout")]
+        public static extern global::System.IntPtr Window_NewRootLayout();
+
         //for watch
         [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_new_WatchTime")]
         public static extern global::System.IntPtr new_WatchTime();
index dce0a41..f3fe522 100755 (executable)
@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright(c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -64,6 +64,7 @@ namespace Tizen.NUI
             }
         }
 
+
         /// <summary>
         /// Removes a child view from this layer. If the view was not a child of this layer, this is a no-op.
         /// </summary>
@@ -462,6 +463,16 @@ namespace Tizen.NUI
             return ret;
         }
 
+        internal void AddViewToLayerList( View view )
+        {
+            Children.Add(view);
+        }
+
+        internal void RemoveViewFromLayerList( View view )
+        {
+            Children.Remove(view);
+        }
+
         /// <summary>
         /// Enumeration for the behavior of the layer.
         /// </summary>
index 960194e..a6c838e 100755 (executable)
@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright(c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,6 +31,8 @@ namespace Tizen.NUI
     {
         private global::System.Runtime.InteropServices.HandleRef swigCPtr;
         private global::System.Runtime.InteropServices.HandleRef stageCPtr;
+        private global::System.Runtime.InteropServices.HandleRef rootLayoutCPtr;
+        private global::System.IntPtr rootLayoutIntPtr;
         private Layer _rootLayer;
         private string _windowTitle;
 
@@ -49,6 +51,15 @@ namespace Tizen.NUI
             if (NDalicPINVOKE.Stage_IsInstalled())
             {
                 stageCPtr = new global::System.Runtime.InteropServices.HandleRef(this, NDalicPINVOKE.Stage_GetCurrent());
+                // Create a root layout (AbsoluteLayout) that is invisible to the user but enables layouts added to the Window
+                // Enables layouts added to the Window to have a parent layout.  As parent layout is needed to store measure spec properties.
+                // Currently without these measure specs the new layout added will always be the size of the window.
+                rootLayoutIntPtr = NDalicManualPINVOKE.Window_NewRootLayout();
+                // Store HandleRef used by Add()
+                rootLayoutCPtr = new global::System.Runtime.InteropServices.HandleRef(this, rootLayoutIntPtr);
+                Layer rootLayer = GetRootLayer();
+                // Add the root layout created above to the root layer.
+                NDalicPINVOKE.Actor_Add(  Layer.getCPtr(rootLayer), rootLayoutCPtr );
             }
         }
 
@@ -597,7 +608,9 @@ namespace Tizen.NUI
         /// <since_tizen> 3 </since_tizen>
         public void Add(View view)
         {
-            GetRootLayer()?.Add(view);
+            NDalicPINVOKE.Actor_Add( rootLayoutCPtr, View.getCPtr(view) );
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            this.GetRootLayer().AddViewToLayerList(view); // Maintain the children list in the Layer
         }
 
         /// <summary>
@@ -607,7 +620,8 @@ namespace Tizen.NUI
         /// <since_tizen> 3 </since_tizen>
         public void Remove(View view)
         {
-            GetRootLayer()?.Remove(view);
+            NDalicPINVOKE.Actor_Remove( rootLayoutCPtr, View.getCPtr(view) );
+            this.GetRootLayer().RemoveViewFromLayerList(view); // Maintain the children list in the Layer
         }
 
         internal Vector2 GetSize()
@@ -662,6 +676,7 @@ namespace Tizen.NUI
             // Core has been initialized, not when Stage is ready.
             if (_rootLayer == null && Window.IsInstalled())
             {
+                // Get RootLayer so can add RootLayout to it.
                 _rootLayer = new Layer(NDalicPINVOKE.Stage_GetRootLayer(stageCPtr), true);
                 if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
                 LayersChildren.Add(_rootLayer);
diff --git a/test/NUITestSample/NUITestSample/examples/layouting/custom-layout-test.cs b/test/NUITestSample/NUITestSample/examples/layouting/custom-layout-test.cs
new file mode 100755 (executable)
index 0000000..e2ae421
--- /dev/null
@@ -0,0 +1,348 @@
+using System;
+using System.Threading;
+using Tizen.NUI;
+using Tizen.NUI.BaseComponents;
+using System.Collections.Generic;
+
+namespace NUILayoutSample
+{
+    static class Images
+    {
+        public static string resources = Tizen.Applications.Application.Current.DirectoryInfo.Resource;
+        public static readonly string[] s_images = new string[]
+        {
+            resources + "images/gallery-1.jpg",
+            resources + "images/gallery-2.jpg",
+            resources + "images/gallery-3.jpg",
+            resources + "images/gallery-4.jpg",
+            resources + "images/image-1.jpg",
+            resources + "images/image-2.jpg",
+            resources + "images/image-3.jpg",
+        };
+    }
+
+    public class CustomLayoutHorizental : LayoutGroup
+    {
+        private static LayoutItem[] childLayouts = new LayoutItem[10];
+
+        public CustomLayoutHorizental()
+        {
+            Console.WriteLine($"CustomLayoutHorizental() constructor!");
+        }
+        protected override void OnMeasure(LayoutMeasureSpec widthMeasureSpec, LayoutMeasureSpec heightMeasureSpec)
+        {
+            Console.WriteLine($"CustomLayoutHorizental OnMeasure() START");
+
+            var accumulatedWidth = new LayoutLength(0);
+            var maxHeight = new LayoutLength(0);
+
+            // this is needed, otherwise the child's LayoutItem is garbage collected!
+            for (uint i = 0; i < ChildCount; ++i)
+            {
+                childLayouts[i] = GetChildAt(i);
+            }
+
+            // In this layout we will:
+            //  Measuring the layout with the children in a horizontal configuration, one after another
+            //  Set the required width to be the accumulated width of our children
+            //  Set the required height to be the maximum height of any of our children
+            for (uint i = 0; i < ChildCount; ++i)
+            {
+                var childLayout = childLayouts[i];
+
+                Console.WriteLine($"child count={ChildCount}, i={i}");
+                if (childLayout)
+                {
+                    MeasureChild(childLayout, widthMeasureSpec, heightMeasureSpec);
+                    accumulatedWidth += childLayout.MeasuredWidth;
+                    maxHeight.Value = System.Math.Max(childLayout.MeasuredHeight.Value, maxHeight.Value);
+                    Console.WriteLine($"child layout is not NULL! accumulatedWidth={accumulatedWidth.Value}, i={i}");
+                }
+            }
+            // Finally, call this method to set the dimensions we would like
+            SetMeasuredDimensions(new MeasuredSize(accumulatedWidth), new MeasuredSize(maxHeight));
+            Console.WriteLine($"CustomLayoutHorizental OnMeasure() accumlated width={accumulatedWidth.Value}, maxHeight={maxHeight.Value} END");
+        }
+        protected override void OnLayout(bool changed, LayoutLength left, LayoutLength top, LayoutLength right, LayoutLength bottom)
+        {
+            Console.WriteLine($"CustomLayoutHorizental OnLayout() START");
+
+            LayoutLength childTop = new LayoutLength(0);
+            LayoutLength childLeft = new LayoutLength(0);
+
+            // We want to vertically align the children to the middle
+            var height = bottom - top;
+            var middle = height / 2;
+
+            // Horizontally align the children to the middle of the space they are given too
+            var width = right - left;
+            uint count = ChildCount;
+            Console.WriteLine($"child count={count}");
+
+            var childIncrement = 0;
+            if (count > 0)
+            {
+                childIncrement = width.Value / System.Convert.ToInt32(count);
+            }
+            var center = childIncrement / 2;
+
+            // Check layout direction
+            var view = GetOwner();
+            ViewLayoutDirectionType layoutDirection = view.LayoutDirection;
+
+            // this is needed, otherwise the child's LayoutItem is garbage collected!
+            for (uint i = 0; i < ChildCount; ++i)
+            {
+                childLayouts[i] = GetChildAt(i);
+            }
+
+            for (uint i = 0; i < count; i++)
+            {
+                uint itemIndex;
+                // If RTL, then layout the last item first
+                if (layoutDirection == ViewLayoutDirectionType.RTL)
+                {
+                    itemIndex = count - 1 - i;
+                }
+                else
+                {
+                    itemIndex = i;
+                }
+
+                var childLayout = childLayouts[itemIndex];
+                if (childLayout)
+                {
+                    var childWidth = childLayout.MeasuredWidth;
+                    var childHeight = childLayout.MeasuredHeight;
+
+                    childTop = middle - (childHeight / 2);
+
+                    var leftPosition = childLeft + center - childWidth / 2;
+
+                    childLayout.Layout(leftPosition, childTop, leftPosition + childWidth, childTop + childHeight);
+                    childLeft += childIncrement;
+
+                    Console.WriteLine($"child layout is not NULL! childWidth={childWidth.Value}, i={i}");
+                }
+            }
+            Console.WriteLine($"CustomLayoutHorizental OnLayout() END");
+        }
+    }
+
+    public class CustomLayoutVertical : LayoutGroup
+    {
+        public CustomLayoutVertical()
+        {
+            this.LayoutAnimate = true;
+        }
+
+        private static LayoutItem[] childLayouts = new LayoutItem[10];
+
+        protected override void OnMeasure(LayoutMeasureSpec widthMeasureSpec, LayoutMeasureSpec heightMeasureSpec)
+        {
+            var accumulatedHeight = new LayoutLength(0);
+            var maxWidth = new LayoutLength(0);
+
+            for (uint i = 0; i < ChildCount; ++i)
+            {
+                childLayouts[i] = GetChildAt(i);
+            }
+
+            for (uint i = 0; i < ChildCount; ++i)
+            {
+                var childLayout = childLayouts[i];
+                if (childLayout)
+                {
+                    MeasureChild(childLayout, widthMeasureSpec, heightMeasureSpec);
+                    accumulatedHeight += childLayout.MeasuredHeight;
+                    maxWidth.Value = System.Math.Max(childLayout.MeasuredWidth.Value, maxWidth.Value);
+                    Console.WriteLine($"CustomLayoutVertical child layout is not NULL! accumulatedHeight={accumulatedHeight.Value}, i={i}");
+                }
+            }
+            SetMeasuredDimensions(new MeasuredSize(maxWidth), new MeasuredSize(accumulatedHeight));
+            Console.WriteLine($"CustomLayoutVertical OnMeasure() max width={maxWidth.Value}, accumulated Height={accumulatedHeight.Value}");
+        }
+
+        protected override void OnLayout(bool changed, LayoutLength left, LayoutLength top, LayoutLength right, LayoutLength bottom)
+        {
+            LayoutLength childTop = new LayoutLength(0);
+            LayoutLength childLeft = new LayoutLength(0);
+
+            var height = bottom - top;
+            var width = right - left;
+            var middle = width / 2;
+
+            uint count = ChildCount;
+            var childIncrement = 0;
+            if (count > 0)
+            {
+                childIncrement = height.Value / System.Convert.ToInt32(count);
+            }
+            var center = childIncrement / 2;
+
+            var view = GetOwner();
+            ViewLayoutDirectionType layoutDirection = view.LayoutDirection;
+
+            for (uint i = 0; i < ChildCount; ++i)
+            {
+                childLayouts[i] = GetChildAt(i);
+            }
+
+            for (uint i = 0; i < count; i++)
+            {
+                uint itemIndex;
+                if (layoutDirection == ViewLayoutDirectionType.RTL)
+                {
+                    itemIndex = count - 1 - i;
+                }
+                else
+                {
+                    itemIndex = i;
+                }
+
+                var childLayout = childLayouts[itemIndex];
+                if (childLayout)
+                {
+                    var childWidth = childLayout.MeasuredWidth;
+                    var childHeight = childLayout.MeasuredHeight;
+
+                    childLeft = middle - (childWidth / 2);
+
+                    var topPosition = childTop + center - childHeight / 2;
+
+                    childLayout.Layout(childLeft, topPosition, childLeft + childWidth, topPosition + childHeight);
+                    childTop += childIncrement;
+
+                    Console.WriteLine($"CustomLayoutVertical child layout is not NULL! childWidth={childWidth.Value}, i={i}");
+                }
+            }
+            Console.WriteLine($"CustomLayoutVertical OnLayout() END");
+        }
+    }
+
+
+
+    class Example : NUIApplication
+    {
+        public Example() : base()
+        {
+            Console.WriteLine("Example()!");
+        }
+
+        protected override void OnCreate()
+        {
+            base.OnCreate();
+            Initialize();
+        }
+
+        static View rootLayoutView, linearContainer;
+        const int MAX_CHILDREN = 7;
+        static ImageView[] imageViews = new ImageView[MAX_CHILDREN];
+        static CustomLayoutHorizental horizontalLayout;
+        static CustomLayoutVertical verticalLayout;
+        static AbsoluteLayout rootLayout;
+
+        private void Initialize()
+        {
+            Console.WriteLine("Initialize()!");
+            Window window = Window.Instance;
+            window.BackgroundColor = Color.Green;
+
+            rootLayoutView = new View();
+            rootLayoutView.WidthSpecificationFixed = 1900;
+            rootLayoutView.HeightSpecificationFixed = 1000;
+            rootLayoutView.Position = new Position(0, 0, 0);
+            rootLayoutView.BackgroundColor = Color.Magenta;
+            window.Add(rootLayoutView);
+
+            linearContainer = new View();
+            linearContainer.PositionUsesPivotPoint = true;
+            linearContainer.PivotPoint = PivotPoint.Center;
+            linearContainer.ParentOrigin = ParentOrigin.Center;
+            //linearContainer.BackgroundColor = Color.Yellow;
+            linearContainer.KeyEvent += OnKeyEvent;
+            linearContainer.Focusable = true;
+
+
+            rootLayoutView.Add(linearContainer);
+            //window.Add(linearContainer);
+            FocusManager.Instance.SetCurrentFocusView(linearContainer);
+            FocusManager.Instance.FocusIndicator = new View();
+
+            for (int index = 0; index < MAX_CHILDREN - 3; index++)
+            {
+                imageViews[index] = new ImageView(Images.s_images[index]);
+                imageViews[index].WidthSpecificationFixed = 150;
+                imageViews[index].HeightSpecificationFixed = 100;
+                linearContainer.Add(imageViews[index]);
+            }
+            for (int index = MAX_CHILDREN - 3; index < MAX_CHILDREN; index++)
+            {
+                imageViews[index] = new ImageView(Images.s_images[index]);
+                imageViews[index].WidthSpecificationFixed = 150;
+                imageViews[index].HeightSpecificationFixed = 100;
+                imageViews[index].Name = "t_image" + (index - 3);
+            }
+
+            horizontalLayout = new CustomLayoutHorizental();
+            verticalLayout = new CustomLayoutVertical();
+            horizontalLayout.LayoutAnimate = true;
+            linearContainer.Layout = horizontalLayout;
+
+            rootLayout = new AbsoluteLayout();
+            rootLayoutView.Layout = rootLayout;
+        }
+
+        int cnt1 = 1;
+        private bool OnKeyEvent(object source, View.KeyEventArgs e)
+        {
+            if (e.Key.State == Key.StateType.Down)
+            {
+                Console.WriteLine($"key pressed name={e.Key.KeyPressedName}");
+                switch (e.Key.KeyPressedName)
+                {
+                    case "Right":
+                        if (cnt1 < 4 && cnt1 > 0)
+                        {
+                            linearContainer.Add(imageViews[cnt1 + 3]);
+                            cnt1++;
+                        }
+                        break;
+
+                    case "Left":
+                        if (cnt1 - 1 < 4 && cnt1 - 1 > 0)
+                        {
+                            View tmp = linearContainer.FindChildByName("t_image" + (cnt1 - 1));
+                            if (tmp != null)
+                            {
+                                linearContainer.Remove(tmp);
+                                cnt1--;
+                            }
+                        }
+                        break;
+
+                    case "Up":
+                        linearContainer.Layout = verticalLayout;
+                        break;
+
+                    case "Down":
+                        linearContainer.Layout = horizontalLayout;
+                        break;
+
+                    case "Return":
+                        if (linearContainer.LayoutDirection == ViewLayoutDirectionType.LTR) { linearContainer.LayoutDirection = ViewLayoutDirectionType.RTL; }
+                        else { linearContainer.LayoutDirection = ViewLayoutDirectionType.LTR; }
+                        break;
+                }
+            }
+            return true;
+        }
+
+        [STAThread]
+        static void Main(string[] args)
+        {
+            Example layoutSample = new Example();
+            layoutSample.Run(args);
+        }
+    }
+}
diff --git a/test/NUITestSample/NUITestSample/examples/layouting/custom-layout-without-absoluteLayout-test.cs b/test/NUITestSample/NUITestSample/examples/layouting/custom-layout-without-absoluteLayout-test.cs
new file mode 100755 (executable)
index 0000000..a67ba21
--- /dev/null
@@ -0,0 +1,193 @@
+using System;
+using Tizen.NUI;
+using Tizen.NUI.BaseComponents;
+
+namespace SimpleLayout
+{
+    public class CustomLayout : LayoutGroup
+    {
+        protected override void OnMeasure(LayoutMeasureSpec widthMeasureSpec, LayoutMeasureSpec heightMeasureSpec)
+        {
+            var accumulatedWidth = new LayoutLength(0);
+            var maxHeight = 0;
+            var measuredWidth = new LayoutLength(0);
+            LayoutLength measuredHeight = new LayoutLength(0);
+            LayoutMeasureSpec.ModeType widthMode = widthMeasureSpec.Mode;
+            LayoutMeasureSpec.ModeType heightMode = heightMeasureSpec.Mode;
+
+            bool isWidthExact = (widthMode == LayoutMeasureSpec.ModeType.EXACTLY);
+            bool isHeightExact = (heightMode == LayoutMeasureSpec.ModeType.EXACTLY);
+
+            // In this layout we will:
+            //  Measuring the layout with the children in a horizontal configuration, one after another
+            //  Set the required width to be the accumulated width of our children
+            //  Set the required height to be the maximum height of any of our children
+
+            for (uint i = 0; i < ChildCount; ++i)
+            {
+                var childLayout = GetChildAt(i);
+                if (childLayout)
+                {
+                    MeasureChild(childLayout, widthMeasureSpec, heightMeasureSpec);
+                    accumulatedWidth += childLayout.MeasuredWidth;
+                    maxHeight = System.Math.Max(childLayout.MeasuredHeight.Value, maxHeight);
+                }
+            }
+
+            measuredHeight.Value = maxHeight;
+            measuredWidth = accumulatedWidth;
+
+            if (isWidthExact)
+            {
+                measuredWidth = new LayoutLength(widthMeasureSpec.Size);
+            }
+
+            if (isHeightExact)
+            {
+                measuredHeight = new LayoutLength(heightMeasureSpec.Size);
+            }
+
+            // Finally, call this method to set the dimensions we would like
+            SetMeasuredDimensions(new MeasuredSize(measuredWidth), new MeasuredSize(measuredHeight));
+        }
+
+        protected override void OnLayout(bool changed, LayoutLength left, LayoutLength top, LayoutLength right, LayoutLength bottom)
+        {
+            LayoutLength childTop = new LayoutLength(0);
+            LayoutLength childLeft = new LayoutLength(0);
+
+            // We want to vertically align the children to the middle
+            var height = bottom - top;
+            var middle = height / 2;
+
+            // Horizontally align the children to the middle of the space they are given too
+            var width = right - left;
+            uint count = ChildCount;
+            var childIncrement = 0;
+            if (count > 0)
+            {
+                childIncrement = width.Value / System.Convert.ToInt32(count);
+            }
+            var center = childIncrement / 2;
+
+            // Check layout direction
+            var view = GetOwner();
+            ViewLayoutDirectionType layoutDirection = view.LayoutDirection;
+
+            for (uint i = 0; i < count; i++)
+            {
+                uint itemIndex;
+                // If RTL, then layout the last item first
+                if (layoutDirection == ViewLayoutDirectionType.RTL)
+                {
+                    itemIndex = count - 1 - i;
+                }
+                else
+                {
+                    itemIndex = i;
+                }
+
+                LayoutItem childLayout = GetChildAt(itemIndex);
+                if (childLayout)
+                {
+                    var childWidth = childLayout.MeasuredWidth;
+                    var childHeight = childLayout.MeasuredHeight;
+
+                    childTop = middle - (childHeight / 2);
+
+                    var leftPosition = childLeft + center - childWidth / 2;
+
+                    childLayout.Layout(leftPosition, childTop, leftPosition + childWidth, childTop + childHeight);
+                    childLeft += childIncrement;
+                }
+            }
+        }
+    }
+}
+
+namespace SimpleLayout
+{
+    static class TestImages
+    {
+        //private const string resources = "./res";
+        public static string resources = Tizen.Applications.Application.Current.DirectoryInfo.Resource;
+        /// Child image filenames
+        public static readonly string[] s_images = new string[]
+        {
+            resources + "/images/application-icon-101.png",
+            resources + "/images/application-icon-102.png",
+            resources + "/images/application-icon-103.png",
+            resources + "/images/application-icon-104.png"
+        };
+    }
+
+    class SimpleLayout : NUIApplication
+    {
+        protected override void OnCreate()
+        {
+            base.OnCreate();
+            Initialize();
+        }
+
+        private void Initialize()
+        {
+            // Change the background color of Window to White
+            Window window = Window.Instance;
+            window.BackgroundColor = Color.White;
+
+            //Layer layer = new Layer();
+
+            //window.AddLayer(layer);
+
+            // Create a new view
+            View customLayoutView = new View();
+            customLayoutView.Name = "CustomLayoutView";
+            customLayoutView.ParentOrigin = ParentOrigin.Center;
+            customLayoutView.PivotPoint = PivotPoint.Center;
+            customLayoutView.PositionUsesPivotPoint = true;
+            // Set our Custom Layout on the view
+            var layout = new CustomLayout();
+            customLayoutView.Layout = layout;
+            customLayoutView.SetProperty(LayoutItemWrapper.ChildProperty.WIDTH_SPECIFICATION, new PropertyValue(-2));  // -2 WRAP_CONTENT
+            customLayoutView.SetProperty(LayoutItemWrapper.ChildProperty.HEIGHT_SPECIFICATION, new PropertyValue(350));
+            customLayoutView.BackgroundColor = Color.Blue;
+            window.Add(customLayoutView);
+
+            // Add child image-views to the created view
+            foreach (String image in TestImages.s_images)
+            {
+                customLayoutView.Add(CreateChildImageView(image, new Size2D(100, 100)));
+            }
+        }
+
+        /// <summary>
+        /// Helper function to create ImageViews with given filename and size..<br />
+        /// </summary>
+        /// <param name="filename"> The filename of the image to use.</param>
+        /// <param name="size"> The size that the image should be loaded at.</param>
+        /// <returns>The created ImageView.</returns>
+        ImageView CreateChildImageView(String url, Size2D size)
+        {
+            ImageView imageView = new ImageView();
+            ImageVisual imageVisual = new ImageVisual();
+
+            imageVisual.URL = url;
+            imageVisual.DesiredHeight = size.Height;
+            imageVisual.DesiredWidth = size.Width;
+            imageView.Image = imageVisual.OutputVisualMap;
+
+            imageView.Name = "ImageView";
+            imageView.HeightResizePolicy = ResizePolicyType.Fixed;
+            imageView.WidthResizePolicy = ResizePolicyType.Fixed;
+            return imageView;
+        }
+
+        static void _Main(string[] args)
+        {
+            SimpleLayout simpleLayout = new SimpleLayout();
+            simpleLayout.Run(args);
+        }
+    }
+}
+
+
diff --git a/test/NUITestSample/NUITestSample/examples/layouting/flex-layout-test.cs b/test/NUITestSample/NUITestSample/examples/layouting/flex-layout-test.cs
new file mode 100755 (executable)
index 0000000..58d81c4
--- /dev/null
@@ -0,0 +1,141 @@
+using System;
+using System.Threading;
+using Tizen.NUI;
+using Tizen.NUI.BaseComponents;
+
+namespace NUIFlexLayoutSample
+{
+    static class Images
+    {
+        public static string resources = Tizen.Applications.Application.Current.DirectoryInfo.Resource;
+        public static readonly string[] s_images = new string[]
+        {
+            resources + "images/application-icon-101.png",
+            resources + "images/application-icon-102.png",
+            resources + "images/application-icon-103.png",
+            resources + "images/application-icon-104.png",
+            resources + "images/image-1.jpg",
+            resources + "images/image-2.jpg",
+            resources + "images/image-3.jpg",
+        };
+    }
+
+    class Example : NUIApplication
+    {
+        public Example() : base()
+        {
+            Console.WriteLine("Example()!");
+        }
+
+        protected override void OnCreate()
+        {
+            base.OnCreate();
+            Initialize();
+        }
+
+        View flexContainer;
+        const int MAX_CHILDREN = 7;
+        ImageView[] imageViews = new ImageView[MAX_CHILDREN];
+        private void Initialize()
+        {
+            Console.WriteLine("Initialize()!");
+            Window window = Window.Instance;
+            window.BackgroundColor = Color.Green;
+
+            flexContainer = new View();
+            flexContainer.PositionUsesPivotPoint = true;
+            flexContainer.PivotPoint = PivotPoint.Center;
+            flexContainer.ParentOrigin = ParentOrigin.Center;
+            flexContainer.BackgroundColor = Color.Yellow;
+
+            for (int index = 0; index < MAX_CHILDREN - 3; index++)
+            {
+                imageViews[index] = new ImageView(Images.s_images[index]);
+                imageViews[index].WidthSpecificationFixed = 100;
+                imageViews[index].HeightSpecificationFixed = 100;
+                flexContainer.Add(imageViews[index]);
+            }
+            for (int index = MAX_CHILDREN - 3; index < MAX_CHILDREN; index++)
+            {
+                imageViews[index] = new ImageView(Images.s_images[index]);
+                imageViews[index].WidthSpecificationFixed = 200;
+                imageViews[index].HeightSpecificationFixed = 200;
+                imageViews[index].Name = "t_image" + (index - 3);
+            }
+
+            var layout = new FlexLayout();
+            layout.LayoutAnimate = true;
+            layout.Direction = FlexLayout.FlexDirection.ColumnReverse;
+            flexContainer.WidthSpecificationFixed = 500;
+            flexContainer.HeightSpecificationFixed = 500;
+            flexContainer.Layout = layout;
+
+            window.Add(flexContainer);
+            window.KeyEvent += OnKeyEvent;
+        }
+
+        int cnt1 = 1;
+        private void OnKeyEvent(object source, Window.KeyEventArgs e)
+        {
+            if (e.Key.State == Key.StateType.Down)
+            {
+                Console.WriteLine($"key pressed name={e.Key.KeyPressedName}");
+                switch (e.Key.KeyPressedName)
+                {
+                    case "Right":
+                        if (cnt1 < 4 && cnt1 > 0)
+                        {
+                            flexContainer.Add(imageViews[cnt1 + 3]);
+                            cnt1++;
+                        }
+                        break;
+
+                    case "Left":
+                        if (cnt1 - 1 < 4 && cnt1 - 1 > 0)
+                        {
+                            View tmp = flexContainer.FindChildByName("t_image" + (cnt1 - 1));
+                            if (tmp != null)
+                            {
+                                flexContainer.Remove(tmp);
+                                cnt1--;
+                            }
+                        }
+                        break;
+
+                    case "Up":
+                        var vertical = new FlexLayout();
+                        vertical.LayoutAnimate = true;
+                        vertical.Direction = FlexLayout.FlexDirection.Column;
+                        flexContainer.Layout = vertical;
+                        break;
+
+                    case "Down":
+                        var horizon = new FlexLayout();
+                        horizon.LayoutAnimate = true;
+                        horizon.Direction = FlexLayout.FlexDirection.Row;
+                        flexContainer.Layout = horizon;
+                        break;
+
+                    case "Return":
+                        if (flexContainer.LayoutDirection == ViewLayoutDirectionType.LTR) { flexContainer.LayoutDirection = ViewLayoutDirectionType.RTL; }
+                        else { flexContainer.LayoutDirection = ViewLayoutDirectionType.LTR; }
+                        break;
+
+                    case "1":
+                        var tmpLayout = flexContainer.Layout as FlexLayout;
+                        if (tmpLayout.WrapType == FlexLayout.FlexWrapType.NoWrap) { tmpLayout.WrapType = FlexLayout.FlexWrapType.Wrap; }
+                        else { tmpLayout.WrapType = FlexLayout.FlexWrapType.NoWrap; }
+                        break;
+                }
+            }
+        }
+
+        [STAThread]
+        static void Main(string[] args)
+        {
+            Example layoutSample = new Example();
+            layoutSample.Run(args);
+        }
+
+    }
+}
diff --git a/test/NUITestSample/NUITestSample/examples/layouting/linear-layout-test.cs b/test/NUITestSample/NUITestSample/examples/layouting/linear-layout-test.cs
new file mode 100755 (executable)
index 0000000..9493a1c
--- /dev/null
@@ -0,0 +1,152 @@
+using System;
+using System.Threading;
+using Tizen.NUI;
+using Tizen.NUI.BaseComponents;
+
+namespace NUILayoutSample
+{
+    static class Images
+    {
+        public static string resources = Tizen.Applications.Application.Current.DirectoryInfo.Resource;
+        public static readonly string[] s_images = new string[]
+        {
+            resources + "images/application-icon-101.png",
+            resources + "images/application-icon-102.png",
+            resources + "images/application-icon-103.png",
+            resources + "images/application-icon-104.png",
+            resources + "images/image-1.jpg",
+            resources + "images/image-2.jpg",
+            resources + "images/image-3.jpg",
+        };
+    }
+
+    class Example : NUIApplication
+    {
+        public Example() : base()
+        {
+            Console.WriteLine("Example()!");
+        }
+
+        protected override void OnCreate()
+        {
+            base.OnCreate();
+            Initialize();
+        }
+
+        View rootLayoutView, linearContainer;
+        const int MAX_CHILDREN = 7;
+        ImageView[] imageViews = new ImageView[MAX_CHILDREN];
+        private void Initialize()
+        {
+            Console.WriteLine("Initialize()!");
+            Window window = Window.Instance;
+            window.BackgroundColor = Color.Green;
+
+            rootLayoutView = new View();
+            rootLayoutView.WidthSpecificationFixed = 1900;
+            rootLayoutView.HeightSpecificationFixed = 1000;
+            rootLayoutView.Position = new Position(0, 0, 0);
+            rootLayoutView.BackgroundColor = Color.Green;
+            window.Add(rootLayoutView);
+
+            linearContainer = new View();
+            linearContainer.PositionUsesPivotPoint = true;
+            linearContainer.PivotPoint = PivotPoint.Center;
+            linearContainer.ParentOrigin = ParentOrigin.Center;
+            linearContainer.BackgroundColor = Color.Yellow;
+            linearContainer.KeyEvent += OnKeyEvent;
+            linearContainer.Focusable = true;
+
+            rootLayoutView.Add(linearContainer);
+            FocusManager.Instance.SetCurrentFocusView(linearContainer);
+
+            for (int index = 0; index < MAX_CHILDREN - 3; index++)
+            {
+                imageViews[index] = new ImageView(Images.s_images[index]);
+                imageViews[index].WidthSpecificationFixed = 150;
+                imageViews[index].HeightSpecificationFixed = 100;
+                linearContainer.Add(imageViews[index]);
+            }
+            for (int index = MAX_CHILDREN - 3; index < MAX_CHILDREN; index++)
+            {
+                imageViews[index] = new ImageView(Images.s_images[index]);
+                imageViews[index].WidthSpecificationFixed = 150;
+                imageViews[index].HeightSpecificationFixed = 100;
+                imageViews[index].Name = "t_image" + (index - 3);
+                //test!
+                //imageViews[index].WidthSpecification = ChildLayoutData.MatchParent;
+                //imageViews[index].HeightSpecification = ChildLayoutData.MatchParent;
+            }
+
+            var layout = new LinearLayout();
+            layout.LayoutAnimate = true;
+            layout.LinearOrientation = LinearLayout.Orientation.Vertical;
+            //layout.CellPadding = new LayoutSize(50, 50);
+            linearContainer.WidthSpecification = ChildLayoutData.WrapContent;
+            linearContainer.HeightSpecification = ChildLayoutData.WrapContent;
+            linearContainer.Layout = layout;
+
+            var rootLayout = new AbsoluteLayout();
+            rootLayoutView.Layout = rootLayout;
+        }
+
+        int cnt1 = 1;
+        private bool OnKeyEvent(object source, View.KeyEventArgs e)
+        {
+            if (e.Key.State == Key.StateType.Down)
+            {
+                Console.WriteLine($"key pressed name={e.Key.KeyPressedName}");
+                switch (e.Key.KeyPressedName)
+                {
+                    case "Right":
+                        if (cnt1 < 4 && cnt1 > 0)
+                        {
+                            linearContainer.Add(imageViews[cnt1 + 3]);
+                            cnt1++;
+                        }
+                        break;
+
+                    case "Left":
+                        if (cnt1 - 1 < 4 && cnt1 - 1 > 0)
+                        {
+                            View tmp = linearContainer.FindChildByName("t_image" + (cnt1 - 1));
+                            if (tmp != null)
+                            {
+                                linearContainer.Remove(tmp);
+                                cnt1--;
+                            }
+                        }
+                        break;
+
+                    case "Up":
+                        var vertical = new LinearLayout();
+                        vertical.LayoutAnimate = true;
+                        vertical.LinearOrientation = LinearLayout.Orientation.Vertical;
+                        linearContainer.Layout = vertical;
+                        break;
+
+                    case "Down":
+                        var horizon = new LinearLayout();
+                        horizon.LayoutAnimate = true;
+                        horizon.LinearOrientation = LinearLayout.Orientation.Horizontal;
+                        linearContainer.Layout = horizon;
+                        break;
+
+                    case "Return":
+                        if (linearContainer.LayoutDirection == ViewLayoutDirectionType.LTR) { linearContainer.LayoutDirection = ViewLayoutDirectionType.RTL; }
+                        else { linearContainer.LayoutDirection = ViewLayoutDirectionType.LTR; }
+                        break;
+                }
+            }
+            return true;
+        }
+
+        [STAThread]
+        static void Main(string[] args)
+        {
+            Example layoutSample = new Example();
+            layoutSample.Run(args);
+        }
+
+    }
+}
diff --git a/test/NUITestSample/NUITestSample/res/images/application-icon-101.png b/test/NUITestSample/NUITestSample/res/images/application-icon-101.png
new file mode 100755 (executable)
index 0000000..71e46dd
Binary files /dev/null and b/test/NUITestSample/NUITestSample/res/images/application-icon-101.png differ
diff --git a/test/NUITestSample/NUITestSample/res/images/application-icon-102.png b/test/NUITestSample/NUITestSample/res/images/application-icon-102.png
new file mode 100755 (executable)
index 0000000..0bd01dd
Binary files /dev/null and b/test/NUITestSample/NUITestSample/res/images/application-icon-102.png differ
diff --git a/test/NUITestSample/NUITestSample/res/images/application-icon-103.png b/test/NUITestSample/NUITestSample/res/images/application-icon-103.png
new file mode 100755 (executable)
index 0000000..d362cbc
Binary files /dev/null and b/test/NUITestSample/NUITestSample/res/images/application-icon-103.png differ
diff --git a/test/NUITestSample/NUITestSample/res/images/application-icon-104.png b/test/NUITestSample/NUITestSample/res/images/application-icon-104.png
new file mode 100755 (executable)
index 0000000..dfb2de9
Binary files /dev/null and b/test/NUITestSample/NUITestSample/res/images/application-icon-104.png differ