Process MIN_HEIGHT on tables correctly

Extend all row-heights equally if table's height is bigger than needed.
Notice that we extend rows on the last page

Resolves DEVSIX-1072

Author: ars18wrw

layout/src/main/java/com/itextpdf/layout/renderer/TableRenderer.java

@@ -734,7 +734,7 @@ public LayoutResult layout(LayoutContext layoutContext) {
                     }
                 }
                 // Correct occupied areas of all added cells
-                correctCellsOccupiedAreas(splits, row, targetOverflowRowIndex);
+                correctCellsOccupiedAreas(splits, row, targetOverflowRowIndex, blockMinHeight, layoutBox, bottomTableBorderWidth, row == rows.size() - 1);
             }
             // process footer with collapsed borders
             if ((split || processAsLast || row == rows.size() - 1) && null != footerRenderer) {
@@ -1048,6 +1048,19 @@ public LayoutResult layout(LayoutContext layoutContext) {
                 verticalBorders.add(new ArrayList<Border>());
             }
             verticalBorders.add(rightVerticalBorders);
+
+            if (null != blockMinHeight && blockMinHeight > occupiedArea.getBBox().getHeight() + bottomTableBorderWidth) {
+                float blockBottom = Math.max(occupiedArea.getBBox().getBottom() - ((float) blockMinHeight - occupiedArea.getBBox().getHeight() - bottomTableBorderWidth), layoutBox.getBottom() + bottomTableBorderWidth);
+                if (0 != heights.size()) {
+                    heights.set(heights.size() - 1, heights.get(heights.size() - 1) + occupiedArea.getBBox().getBottom() - blockBottom);
+                } else {
+                    heights.add((occupiedArea.getBBox().getBottom() - blockBottom) + topTableBorderWidth / 2 + bottomTableBorderWidth / 2);
+                }
+
+                occupiedArea.getBBox()
+                        .increaseHeight(occupiedArea.getBBox().getBottom() - blockBottom)
+                        .setY(blockBottom);
+            }
         }
 
         // Apply bottom and top border
@@ -1087,20 +1100,6 @@ public LayoutResult layout(LayoutContext layoutContext) {
             extendLastRow(rows.get(rows.size() - 1), layoutBox);
         }
 
-        if (null != blockMinHeight && blockMinHeight > occupiedArea.getBBox().getHeight()) {
-            float blockBottom = Math.max(occupiedArea.getBBox().getBottom() - ((float) blockMinHeight - occupiedArea.getBBox().getHeight()), layoutBox.getBottom());
-            if (0 != heights.size()) {
-                heights.set(heights.size() - 1, heights.get(heights.size() - 1) + occupiedArea.getBBox().getBottom() - blockBottom);
-            } else {
-                heights.add((occupiedArea.getBBox().getBottom() - blockBottom) + occupiedArea.getBBox().getHeight() / 2);
-            }
-
-            occupiedArea.getBBox()
-                    .increaseHeight(occupiedArea.getBBox().getBottom() - blockBottom)
-                    .setY(blockBottom);
-        }
-
-
         if (isPositioned()) {
             float y = (float) this.getPropertyAsFloat(Property.Y);
             float relativeY = isFixedLayout() ? 0 : layoutBox.getY();
@@ -2007,31 +2006,43 @@ private void fixFooterBorders(List<Border> tableBottomBorders, int colNum, int r
         }
     }
 
-    private void correctCellsOccupiedAreas(LayoutResult[] splits, int row, int[] targetOverflowRowIndex) {
-        // Correct occupied areas of all added cells
-        for (int k = 0; k <= row; k++) {
-            CellRenderer[] currentRow = rows.get(k);
-            if (k < row || (row + 1 == heights.size())) {
-                for (int col = 0; col < currentRow.length; col++) {
-                    CellRenderer cell = (k < row || null == splits[col]) ? currentRow[col] : (CellRenderer) splits[col].getSplitRenderer();
-                    if (cell == null) {
-                        continue;
-                    }
-                    float height = 0;
-                    int rowspan = (int) cell.getPropertyAsInteger(Property.ROWSPAN);
-                    for (int l = k; l > ((k == row + 1) ? targetOverflowRowIndex[col] : k) - rowspan && l >= 0; l--) {
-                        height += (float) heights.get(l);
-                    }
-                    // Correcting cell bbox only. We don't need #move() here.
-                    // This is because of BlockRenderer's specificity regarding occupied area.
-                    float shift = height - cell.getOccupiedArea().getBBox().getHeight();
-                    Rectangle bBox = cell.getOccupiedArea().getBBox();
-                    bBox.moveDown(shift);
-                    bBox.setHeight(height);
-                    cell.applyVerticalAlignment();
+    private void correctCellsOccupiedAreas(LayoutResult[] splits, int row, int[] targetOverflowRowIndex, Float blockMinHeight, Rectangle layoutBox, float bottomTableBorderWidth, boolean isLastRenderer) {
+        float additionalCellHeight = 0;
+        if (isLastRenderer) {
+            if (null != blockMinHeight && blockMinHeight > occupiedArea.getBBox().getHeight() + bottomTableBorderWidth / 2) {
+                additionalCellHeight = Math.min(layoutBox.getHeight() - bottomTableBorderWidth / 2, blockMinHeight - occupiedArea.getBBox().getHeight() - bottomTableBorderWidth / 2) / heights.size();
+                for (int i = 0; i < heights.size(); i++) {
+                    heights.set(i, heights.get(i) + additionalCellHeight);
                 }
             }
         }
+        float cumulativeShift = 0;
+        // Correct occupied areas of all added cells
+        for (int k = 0; k < heights.size(); k++) {
+            CellRenderer[] currentRow = rows.get(k);
+            for (int col = 0; col < currentRow.length; col++) {
+                CellRenderer cell = (k < row || null == splits[col]) ? currentRow[col] : (CellRenderer) splits[col].getSplitRenderer();
+                if (cell == null) {
+                    continue;
+                }
+                float height = 0;
+                int rowspan = (int) cell.getPropertyAsInteger(Property.ROWSPAN);
+                for (int l = k; l > ((k == row + 1) ? targetOverflowRowIndex[col] : k) - rowspan && l >= 0; l--) {
+                    height += (float) heights.get(l);
+                }
+                // Correcting cell bbox only. We don't need #move() here.
+                // This is because of BlockRenderer's specificity regarding occupied area.
+                float shift = height - cell.getOccupiedArea().getBBox().getHeight();
+                Rectangle bBox = cell.getOccupiedArea().getBBox();
+                bBox.moveDown(shift);
+                bBox.setHeight(height);
+                cell.move(0, - (cumulativeShift - (rowspan - 1) * additionalCellHeight));
+                cell.applyVerticalAlignment();
+            }
+            cumulativeShift += additionalCellHeight;
+        }
+        occupiedArea.getBBox().moveDown(cumulativeShift).increaseHeight(cumulativeShift);
+        layoutBox.decreaseHeight(cumulativeShift);
     }
 
     private void prepareBuildingBordersArrays(CellRenderer cell, Border[] tableBorders, int colNum, int row, int col) {
@@ -2328,7 +2339,7 @@ private float getTableWidth() {
 
     protected TableRenderer saveCellsProperties() {
         CellRenderer[] currentRow;
-        int colN = ((Table)getModelElement()).getNumberOfColumns();
+        int colN = ((Table) getModelElement()).getNumberOfColumns();
         for (int row = 0; row < rows.size(); row++) {
             currentRow = rows.get(row);
             for (int col = 0; col < colN; col++) {
@@ -2342,7 +2353,7 @@ protected TableRenderer saveCellsProperties() {
 
     protected TableRenderer restoreCellsProperties() {
         CellRenderer[] currentRow;
-        int colN = ((Table)getModelElement()).getNumberOfColumns();
+        int colN = ((Table) getModelElement()).getNumberOfColumns();
         for (int row = 0; row < rows.size(); row++) {
             currentRow = rows.get(row);
             for (int col = 0; col < colN; col++) {

layout/src/test/java/com/itextpdf/layout/TableTest.java

@@ -53,12 +53,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.utils.CompareTool;
 import com.itextpdf.layout.border.Border;
 import com.itextpdf.layout.border.SolidBorder;
-import com.itextpdf.layout.element.AreaBreak;
-import com.itextpdf.layout.element.Cell;
-import com.itextpdf.layout.element.Image;
-import com.itextpdf.layout.element.Paragraph;
-import com.itextpdf.layout.element.Table;
-import com.itextpdf.layout.element.Text;
+import com.itextpdf.layout.element.*;
 import com.itextpdf.layout.property.HorizontalAlignment;
 import com.itextpdf.layout.property.Property;
 import com.itextpdf.layout.property.UnitValue;
@@ -73,7 +68,6 @@ This file is part of the iText (R) project.
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import java.io.FileNotFoundException;
 import java.io.IOException;
 
 @Category(IntegrationTest.class)
@@ -871,8 +865,7 @@ public void bigRowspanTest05() throws IOException, InterruptedException {
                 .addCell(new Cell(2, 1).add(new Paragraph("cell 1, 1 and 2\n" + longTextContent)))
                 .addCell(new Cell().add(new Paragraph("cell 2, 1\n" + textContent)))
                 .addCell(new Cell().add(new Paragraph("cell 3, 1\n" + textContent)))
-                .addCell(new Cell().add(new Paragraph("cell 3, 2\n" + textContent)))
-                ;
+                .addCell(new Cell().add(new Paragraph("cell 3, 2\n" + textContent)));
 
         doc.add(table);
         doc.close();
@@ -1195,9 +1188,9 @@ public void tableWithSetHeightProperties01() throws IOException, InterruptedExce
 
         String textByron =
                 "When a man hath no freedom to fight for at home,\n" +
-                "    Let him combat for that of his neighbours;\n" +
-                "Let him think of the glories of Greece and of Rome,\n" +
-                "    And get knocked on the head for his labours.\n";
+                        "    Let him combat for that of his neighbours;\n" +
+                        "Let him think of the glories of Greece and of Rome,\n" +
+                        "    And get knocked on the head for his labours.\n";
 
 
         doc.add(new Paragraph("Default layout:"));
@@ -1239,7 +1232,7 @@ public void tableWithSetHeightProperties01() throws IOException, InterruptedExce
         doc.add(table);
         doc.add(new AreaBreak());
 
-        doc.add(new Paragraph("Some cells' heights are setted:"));
+        doc.add(new Paragraph("Some cells' heights are set:"));
         table = new Table(3)
                 .addCell(new Cell().add(textByron).setBorder(new SolidBorder(Color.GREEN, 1)))
                 .addCell(new Cell(1, 2).add(textByron).setBorder(new SolidBorder(Color.YELLOW, 3)).setHeight(300))
@@ -1342,7 +1335,7 @@ public void tableWithSetHeightProperties02() throws IOException, InterruptedExce
         doc.add(new AreaBreak());
 
 
-        doc.add(new Paragraph("Some cells' heights are setted:"));
+        doc.add(new Paragraph("Some cells' heights are set:"));
         table = new Table(3)
                 .addCell(new Cell().add(textByron).setBorder(new SolidBorder(Color.GREEN, 1)))
                 .addCell(new Cell(1, 2).add(textByron).setBorder(new SolidBorder(Color.YELLOW, 3)).setMinHeight(300))
@@ -1371,19 +1364,19 @@ public void emptyTableTest01() throws IOException, InterruptedException {
         Document doc = new Document(pdfDoc);
 
         doc.add(new Table(1)
-                .addCell(new Cell().setPadding(0).setMargin(0).setBorder(Border.NO_BORDER))
-                .addCell(new Cell().setPadding(0).setMargin(0).setBorder(Border.NO_BORDER))
-                .addCell(new Cell().setPadding(0).setMargin(0).setBorder(Border.NO_BORDER))
-                .addCell(new Cell().setPadding(0).setMargin(0).setBorder(Border.NO_BORDER))
-                .addCell(new Cell().add("Hello"))
+                        .addCell(new Cell().setPadding(0).setMargin(0).setBorder(Border.NO_BORDER))
+                        .addCell(new Cell().setPadding(0).setMargin(0).setBorder(Border.NO_BORDER))
+                        .addCell(new Cell().setPadding(0).setMargin(0).setBorder(Border.NO_BORDER))
+                        .addCell(new Cell().setPadding(0).setMargin(0).setBorder(Border.NO_BORDER))
+                        .addCell(new Cell().add("Hello"))
         );
         doc.add(new Table(1).setBorder(new SolidBorder(Color.ORANGE, 2)).addCell("Is my occupied area correct?"));
         doc.add(new AreaBreak());
 
 
         doc.add(new Table(1)
-                .setBorderTop(new SolidBorder(Color.ORANGE, 50))
-                .setBorderBottom(new SolidBorder(Color.MAGENTA, 100))
+                        .setBorderTop(new SolidBorder(Color.ORANGE, 50))
+                        .setBorderBottom(new SolidBorder(Color.MAGENTA, 100))
         );
         doc.add(new Table(1).setBorder(new SolidBorder(Color.ORANGE, 2)).addCell("Is my occupied area correct?"));
         doc.add(new AreaBreak());
@@ -1407,7 +1400,7 @@ public void tableWithCustomRendererTest01() throws IOException, InterruptedExcep
 
         Table table = new Table(2);
         table.setBorder(new SolidBorder(Color.GREEN, 100));
-        
+
         for (int i = 0; i < 10; i++) {
             table.addCell(new Cell().add("Cell No." + i));
         }