[NUI] fix CollecitonView item sizing on MeasureFirst (#3098)

item sizing on MeasureFirst need to reuse pre-calculated result.

diff --git a/src/Tizen.NUI.Components/Controls/RecyclerView/Layouter/GridLayouter.cs b/src/Tizen.NUI.Components/Controls/RecyclerView/Layouter/GridLayouter.cs
index 7821d7a..48cdaee 100755 (executable)
--- a/src/Tizen.NUI.Components/Controls/RecyclerView/Layouter/GridLayouter.cs
+++ b/src/Tizen.NUI.Components/Controls/RecyclerView/Layouter/GridLayouter.cs
@@ -399,17 +399,25 @@ namespace Tizen.NUI.Components
                 (float x, float y) = GetItemPosition(i);
                 // 5. Placing item with Padding and Margin.
                 item.Position = new Position(x, y);
-                
+
                 //Linear Item need to be resized!
                 if (item.IsHeader || item.IsFooter || item.isGroupHeader || item.isGroupFooter)
                 {
+                    var size = (IsHorizontal? item.SizeWidth: item.SizeHeight);
+                    if (colView.SizingStrategy == ItemSizingStrategy.MeasureFirst)
+                    {
+                        if (item.IsHeader) size = headerSize;
+                        else if (item.IsFooter) size = footerSize;
+                        else if (item.isGroupHeader) size = groupHeaderSize;
+                        else if (item.isGroupFooter) size = groupFooterSize;
+                    }
                     if (IsHorizontal && item.HeightSpecification == LayoutParamPolicies.MatchParent)
                     {
-                        item.Size = new Size(item.Size.Width, Container.Size.Height - Padding.Top - Padding.Bottom - item.Margin.Top - item.Margin.Bottom);
+                        item.Size = new Size(size, Container.Size.Height - Padding.Top - Padding.Bottom - item.Margin.Top - item.Margin.Bottom);
                     }
                     else if (!IsHorizontal && item.WidthSpecification == LayoutParamPolicies.MatchParent)
                     {
-                        item.Size = new Size(Container.Size.Width - Padding.Start - Padding.End - item.Margin.Start - item.Margin.End, item.Size.Height);
+                        item.Size = new Size(Container.Size.Width - Padding.Start - Padding.End - item.Margin.Start - item.Margin.End, size);
                     }
                 }
                 //Console.WriteLine("[NUI] ["+item.Index+"] ["+item.Position.X+", "+item.Position.Y+" ==== \n");

diff --git a/src/Tizen.NUI.Components/Controls/RecyclerView/Layouter/LinearLayouter.cs b/src/Tizen.NUI.Components/Controls/RecyclerView/Layouter/LinearLayouter.cs
index 0a820f2..b915b17 100755 (executable)
--- a/src/Tizen.NUI.Components/Controls/RecyclerView/Layouter/LinearLayouter.cs
+++ b/src/Tizen.NUI.Components/Controls/RecyclerView/Layouter/LinearLayouter.cs
@@ -409,14 +409,27 @@ namespace Tizen.NUI.Components
                 // 5. Placing item.
                 (float posX, float posY) = GetItemPosition(i);
                 item.Position = new Position(posX, posY);
-            
+
+                var size = (IsHorizontal? item.SizeWidth: item.SizeHeight);
+
+                if (colView.SizingStrategy == ItemSizingStrategy.MeasureFirst)
+                {
+                    if (item.IsHeader || item.IsFooter || item.isGroupHeader || item.isGroupFooter)
+                    {
+                        if (item.IsHeader) size = headerSize;
+                        else if (item.IsFooter) size = footerSize;
+                        else if (item.isGroupHeader) size = groupHeaderSize;
+                        else if (item.isGroupFooter) size = groupFooterSize;
+                    }
+                    else size = StepCandidate;
+                }
                 if (IsHorizontal && item.HeightSpecification == LayoutParamPolicies.MatchParent)
                 {
-                    item.Size = new Size(item.Size.Width, Container.Size.Height - Padding.Top - Padding.Bottom - item.Margin.Top - item.Margin.Bottom);
+                    item.Size = new Size(size, Container.Size.Height - Padding.Top - Padding.Bottom - item.Margin.Top - item.Margin.Bottom);
                 }
                 else if (!IsHorizontal && item.WidthSpecification == LayoutParamPolicies.MatchParent)
                 {
-                    item.Size = new Size(Container.Size.Width - Padding.Start - Padding.End - item.Margin.Start - item.Margin.End, item.Size.Height);
+                    item.Size = new Size(Container.Size.Width - Padding.Start - Padding.End - item.Margin.Start - item.Margin.End, size);
                 }
             }
             return;