Improve table auto layout in case empty cells with fixed table width

pavel-alay · pavel-alay · commit 8850edc870f1 · 2017-07-25T13:55:36.000+03:00
DEVSIX-1195

Autoported commit.
Original commit hash: [010d71ac1]
diff --git a/itext/itext.layout/itext/layout/renderer/TableWidths.cs b/itext/itext.layout/itext/layout/renderer/TableWidths.cs
@@ -442,6 +442,7 @@ internal float[] AutoLayout() {
                                 else {
                                     float totalFixed = 0;
                                     float totalFlexible = 0;
+                                    float flexibleCount = 0;
                                     for (int i = 0; i < numberOfColumns; i++) {
                                         if (widths[i].isFixed) {
                                             widths[i].finalWidth = widths[i].width;
@@ -450,13 +451,15 @@ internal float[] AutoLayout() {
                                         else {
                                             if (!widths[i].isPercent) {
                                                 totalFlexible += widths[i].width;
+                                                flexibleCount++;
                                             }
                                         }
                                     }
+                                    System.Diagnostics.Debug.Assert(totalFlexible > 0 || flexibleCount > 0);
                                     extraWidth = tableWidth - totalPercent - totalFixed;
                                     for (int i = 0; i < numberOfColumns; i++) {
                                         if (!widths[i].isPercent && !widths[i].isFixed) {
-                                            widths[i].finalWidth = widths[i].width * extraWidth / totalFlexible;
+                                            widths[i].finalWidth = totalFlexible > 0 ? widths[i].width * extraWidth / totalFlexible : extraWidth / flexibleCount;
                                         }
                                     }
                                 }
diff --git a/port-hash b/port-hash
@@ -1 +1 @@
-36b7b2ab1debbcf4abb399de672d2ee2c03eea4d
+010d71ac111f8f411aa0a603cc5b8ecd5970ae79

Original file line number	Diff line number	Diff line change
`@@ -442,6 +442,7 @@ internal float[] AutoLayout() {`
`442`	`442`	`else {`
`443`	`443`	`float totalFixed = 0;`
`444`	`444`	`float totalFlexible = 0;`
	`445`	`+ float flexibleCount = 0;`
`445`	`446`	`for (int i = 0; i < numberOfColumns; i++) {`
`446`	`447`	`if (widths[i].isFixed) {`
`447`	`448`	`widths[i].finalWidth = widths[i].width;`
`@@ -450,13 +451,15 @@ internal float[] AutoLayout() {`
`450`	`451`	`else {`
`451`	`452`	`if (!widths[i].isPercent) {`
`452`	`453`	`totalFlexible += widths[i].width;`
	`454`	`+ flexibleCount++;`
`453`	`455`	`}`
`454`	`456`	`}`
`455`	`457`	`}`
	`458`	`+ System.Diagnostics.Debug.Assert(totalFlexible > 0 \|\| flexibleCount > 0);`
`456`	`459`	`extraWidth = tableWidth - totalPercent - totalFixed;`
`457`	`460`	`for (int i = 0; i < numberOfColumns; i++) {`
`458`	`461`	`if (!widths[i].isPercent && !widths[i].isFixed) {`
`459`		`- widths[i].finalWidth = widths[i].width * extraWidth / totalFlexible;`
	`462`	`+ widths[i].finalWidth = totalFlexible > 0 ? widths[i].width * extraWidth / totalFlexible : extraWidth / flexibleCount;`
`460`	`463`	`}`
`461`	`464`	`}`
`462`	`465`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-36b7b2ab1debbcf4abb399de672d2ee2c03eea4d`
	`1`	`+010d71ac111f8f411aa0a603cc5b8ecd5970ae79`