fixing nested table column calculation

[patch][fix] Tables did not act as expected when nested in either another table or another control (eg. <border>). This is fixed by this commit, by now correctly using remaining size for calculations and recalculating once on arrange with the correct sizes.
X39 · Nov 22, 2023 · 24f3cd7 · 24f3cd7
1 parent ddb1572
commit 24f3cd7
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/source/X39.Solutions.PdfTemplate/Controls/TableCellControl.cs b/source/X39.Solutions.PdfTemplate/Controls/TableCellControl.cs
@@ -31,7 +31,7 @@ protected override Size DoMeasure(
         var height = 0F;
         foreach (var control in Children)
         {
-            var size = control.Measure(fullPageSize, framedPageSize, remainingSize, cultureInfo);
+            var size = control.Measure(fullPageSize, remainingSize, remainingSize, cultureInfo);
             width  =  Math.Max(width, size.Width);
             height += size.Height;
         }
@@ -50,7 +50,7 @@ protected override Size DoArrange(
         var height = 0F;
         foreach (var control in Children)
         {
-            var size = control.Arrange(fullPageSize, framedPageSize, remainingSize, cultureInfo);
+            var size = control.Arrange(fullPageSize, remainingSize, remainingSize, cultureInfo);
             width  =  Math.Max(width, size.Width);
             height += size.Height;
             _heights.Add(size.Height);

diff --git a/source/X39.Solutions.PdfTemplate/Controls/TableControl.cs b/source/X39.Solutions.PdfTemplate/Controls/TableControl.cs
@@ -54,15 +54,15 @@ protected override Size DoMeasure(
         var totalHeight = 0F;
         foreach (var control in Children.OfType<TableHeaderControl>())
         {
-            var size = control.Measure(fullPageSize, framedPageSize, remainingSize, cultureInfo);
+            var size = control.Measure(fullPageSize, remainingSize, remainingSize, cultureInfo);
             totalHeaderHeight += size.Height;
             maxWidth          =  Math.Max(maxWidth, size.Width);
         }
 
         var currentHeight = remainingSize.Height;
         foreach (var control in Children.OfType<TableRowControl>())
         {
-            var size = control.Measure(fullPageSize, framedPageSize, remainingSize, cultureInfo);
+            var size = control.Measure(fullPageSize, remainingSize, remainingSize, cultureInfo);
             maxWidth = Math.Max(maxWidth, size.Width);
             if (currentHeight + size.Height >= remainingSize.Height)
             {
@@ -192,20 +192,33 @@ protected override Size DoArrange(
         in Size remainingSize,
         CultureInfo cultureInfo)
     {
+        var outWidths = CalculateWidths(
+            framedPageSize.Width,
+            CellWidths.Values
+                .Select((q) => (q.columnLength, q.desiredWitdth))
+                .ToArray());
+        for (var i = 0; i < CellWidths.Count; i++)
+        {
+            var key = CellWidths.Keys.ElementAt(i);
+            var (_, columnLength) = CellWidths[key];
+            var newValue = (outWidths.ElementAt(i), columnLength);
+            CellWidths[key] = newValue;
+        }
+
         var totalHeaderHeight = 0F;
         var maxWidth = 0F;
         var totalHeight = 0F;
         foreach (var control in Children.OfType<TableHeaderControl>())
         {
-            var size = control.Arrange(fullPageSize, framedPageSize, remainingSize, cultureInfo);
+            var size = control.Arrange(fullPageSize, remainingSize, remainingSize, cultureInfo);
             totalHeaderHeight += size.Height;
             maxWidth          =  Math.Max(maxWidth, size.Width);
         }
 
         var currentHeight = remainingSize.Height;
         foreach (var control in Children.OfType<TableRowControl>())
         {
-            var size = control.Arrange(fullPageSize, framedPageSize, remainingSize, cultureInfo);
+            var size = control.Arrange(fullPageSize, remainingSize, remainingSize, cultureInfo);
             maxWidth = Math.Max(maxWidth, size.Width);
             if (currentHeight + size.Height >= remainingSize.Height)
             {

diff --git a/source/X39.Solutions.PdfTemplate/Controls/TableRowControlBase.cs b/source/X39.Solutions.PdfTemplate/Controls/TableRowControlBase.cs
@@ -26,7 +26,7 @@ protected override Size DoMeasure(
         var height = 0F;
         foreach (var (control, index) in Children.Cast<TableCellControl>().Indexed())
         {
-            var size = control.Measure(fullPageSize, framedPageSize, remainingSize, cultureInfo);
+            var size = control.Measure(fullPageSize, remainingSize, remainingSize, cultureInfo);
             width              += size.Width;
             height             =  Math.Max(height, size.Height);
             if (Table.CellWidths.TryGetValue(index, out var tuple))
@@ -67,7 +67,7 @@ protected override Size DoArrange(
                 Width = cellWidth,
                 Height = MeasurementInner.Height,
             };
-            var size = control.Arrange(fullPageSize, framedPageSize, remainingCellSize, cultureInfo);
+            var size = control.Arrange(fullPageSize, remainingCellSize, remainingCellSize, cultureInfo);
             width  += cellWidth;
             height =  Math.Max(height, size.Height);
         }