[NUI] respect margin and padding for relative layout (#2524)

For now child's `Margin` and RelativeLayout's `Padding` work correctly.

Co-authored-by: Jiyun Yang <ji.yang@samsung.com>

diff --git a/src/Tizen.NUI/src/internal/Layouting/RelativeLayout.cs b/src/Tizen.NUI/src/internal/Layouting/RelativeLayout.cs
index 0efc594..2b1b592 100644 (file)
--- a/src/Tizen.NUI/src/internal/Layouting/RelativeLayout.cs
+++ b/src/Tizen.NUI/src/internal/Layouting/RelativeLayout.cs
@@ -38,7 +38,7 @@ namespace Tizen.NUI
             GetRelativeOffsetTo = GetRightRelativeOffset,
             GetAlignment = GetHorizontalAlignment,
             GetFill = GetFillHorizontal,
-            GetMeasuredSize = (item) => { return item.MeasuredWidth.Size.AsDecimal(); }
+            GetMeasuredSize = (item) => item.MeasuredWidth.Size.AsDecimal() + item.Margin.Start + item.Margin.End
         };
         private static readonly RelativePropertyGetters RelativeVerticalPropertyGetters = new RelativePropertyGetters
         {
@@ -49,7 +49,7 @@ namespace Tizen.NUI
             GetRelativeOffsetTo = GetBottomRelativeOffset,
             GetAlignment = GetVerticalAlignment,
             GetFill = GetFillVertical,
-            GetMeasuredSize = (item) => { return item.MeasuredHeight.Size.AsDecimal(); }
+            GetMeasuredSize = (item) => item.MeasuredHeight.Size.AsDecimal() + item.Margin.Top + item.Margin.Bottom
         };
 
         delegate Relative GetRelative(View view, in float layoutSize);
@@ -167,6 +167,8 @@ namespace Tizen.NUI
 
             float startPosition = cacheFrom.viewGeometry.Position + cacheFrom.viewGeometry.Size * RelativeOffsetFrom;
             float endPosition = cacheTo.viewGeometry.Position + cacheTo.viewGeometry.Size * RelativeOffsetTo;
+            if (startPosition > endPosition)
+                (startPosition, endPosition) = (endPosition, startPosition);
 
             float alignment = propertyGetters.GetAlignment(view).ToFloat();
             bool fill = propertyGetters.GetFill(view);
@@ -190,10 +192,17 @@ namespace Tizen.NUI
 
         private (float, float) CalculateChildrenSize(float parentWidth, float parentHeight)
         {
-            int minWidth = (int)SuggestedMinimumWidth.AsDecimal();
-            int maxWidth = (int)parentWidth;
-            int minHeight = (int)SuggestedMinimumHeight.AsDecimal();
-            int maxHeight = (int)parentHeight;
+            int horizontalPadding = Padding.Start + Padding.End;
+            int verticalPadding = Padding.Top + Padding.Bottom;
+            int minWidth = (int)SuggestedMinimumWidth.AsDecimal() - horizontalPadding;
+            int maxWidth = (int)parentWidth - verticalPadding;
+            int minHeight = (int)SuggestedMinimumHeight.AsDecimal() - verticalPadding;
+            int maxHeight = (int)parentHeight - verticalPadding;
+
+            if (minWidth < 0) minWidth = 0;
+            if (maxWidth < 0) maxWidth = 0;
+            if (minHeight < 0) minHeight = 0;
+            if (maxHeight < 0) maxHeight = 0;
 
             // Find minimum size that satisfy all constraints
             float BinarySearch(int min, int max, Dictionary<View, Relative> Cache, GetRelative GetRelative)
@@ -219,14 +228,14 @@ namespace Tizen.NUI
                 return current;
             }
 
-            float ChildrenWidth = BinarySearch(minWidth, maxWidth, HorizontalRelativeCache, GetHorizontalRelative);
-            float ChildrenHeight = BinarySearch(minHeight, maxHeight, VerticalRelativeCache, GetVerticalRelative);
+            float ChildrenWidth = BinarySearch(minWidth, maxWidth, HorizontalRelativeCache, GetHorizontalRelative) + horizontalPadding;
+            float ChildrenHeight = BinarySearch(minHeight, maxHeight, VerticalRelativeCache, GetVerticalRelative) + verticalPadding;
             return (ChildrenWidth, ChildrenHeight);
         }
 
-        private Geometry GetHorizontalLayout(View view) => GetHorizontalRelative(view, MeasuredWidth.Size.AsDecimal()).viewGeometry;
+        private Geometry GetHorizontalLayout(View view) => GetHorizontalRelative(view, MeasuredWidth.Size.AsDecimal() - (Padding.Start + Padding.End)).viewGeometry;
 
-        private Geometry GetVerticalLayout(View view) => GetVerticalRelative(view, MeasuredHeight.Size.AsDecimal()).viewGeometry;
+        private Geometry GetVerticalLayout(View view) => GetVerticalRelative(view, MeasuredHeight.Size.AsDecimal() - (Padding.Top + Padding.Bottom)).viewGeometry;
 
         private struct Geometry
         {

diff --git a/src/Tizen.NUI/src/public/Layouting/RelativeLayout.cs b/src/Tizen.NUI/src/public/Layouting/RelativeLayout.cs
index 20ccb20..94136a5 100644 (file)
--- a/src/Tizen.NUI/src/public/Layouting/RelativeLayout.cs
+++ b/src/Tizen.NUI/src/public/Layouting/RelativeLayout.cs
@@ -378,11 +378,10 @@ namespace Tizen.NUI
                     Geometry horizontalGeometry = GetHorizontalLayout(childLayout.Owner);
                     Geometry verticalGeometry = GetVerticalLayout(childLayout.Owner);
 
-                    LayoutLength childLeft =  new LayoutLength(horizontalGeometry.Position);
-                    LayoutLength childRight = new LayoutLength(horizontalGeometry.Position + horizontalGeometry.Size);
-                    LayoutLength childTop = new LayoutLength(verticalGeometry.Position);
-                    LayoutLength childBottom = new LayoutLength(verticalGeometry.Position + verticalGeometry.Size);
-
+                    LayoutLength childLeft = new LayoutLength(horizontalGeometry.Position + Padding.Start + childLayout.Margin.Start);
+                    LayoutLength childRight = new LayoutLength(horizontalGeometry.Position + horizontalGeometry.Size + Padding.Start - childLayout.Margin.End);
+                    LayoutLength childTop = new LayoutLength(verticalGeometry.Position + Padding.Top + childLayout.Margin.Top);
+                    LayoutLength childBottom = new LayoutLength(verticalGeometry.Position + verticalGeometry.Size + Padding.Top - childLayout.Margin.Bottom);
                     childLayout.Layout(childLeft, childTop, childRight, childBottom);
                 }
             }