Align child if freespace isn't negative. Find overflow part before margin processing. Minor fixes.

DEVSIX-992

Author: ars18wrw

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

@@ -1327,18 +1327,20 @@ protected void alignChildHorizontally(IRenderer childRenderer, Rectangle current
         HorizontalAlignment horizontalAlignment = childRenderer.<HorizontalAlignment>getProperty(Property.HORIZONTAL_ALIGNMENT);
         if (horizontalAlignment != null && horizontalAlignment != HorizontalAlignment.LEFT) {
             float freeSpace = availableWidth - childRenderer.getOccupiedArea().getBBox().getWidth();
-            try {
-                switch (horizontalAlignment) {
-                    case RIGHT:
-                        childRenderer.move(freeSpace, 0);
-                        break;
-                    case CENTER:
-                        childRenderer.move(freeSpace / 2, 0);
-                        break;
+            if (freeSpace > 0) {
+                try {
+                    switch (horizontalAlignment) {
+                        case RIGHT:
+                            childRenderer.move(freeSpace, 0);
+                            break;
+                        case CENTER:
+                            childRenderer.move(freeSpace / 2, 0);
+                            break;
+                    }
+                } catch (NullPointerException npe) {
+                    Logger logger = LoggerFactory.getLogger(AbstractRenderer.class);
+                    logger.error(MessageFormatUtil.format(LogMessageConstant.OCCUPIED_AREA_HAS_NOT_BEEN_INITIALIZED, "Some of the children might not end up aligned horizontally."));
                 }
-            } catch (Exception npe) {
-                Logger logger = LoggerFactory.getLogger(AbstractRenderer.class);
-                logger.error(MessageFormatUtil.format(LogMessageConstant.OCCUPIED_AREA_HAS_NOT_BEEN_INITIALIZED, "Some of the children might not end up aligned horizontally."));
             }
         }
     }

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

@@ -383,6 +383,7 @@ public LayoutResult layout(LayoutContext layoutContext) {
                 causeOfNothing = result.getCauseOfNothing();
             }
         }
+        float overflowPartHeight = getOverflowPartHeight(overflowY, layoutBox);
         if (marginsCollapsingEnabled && !isCellRenderer) {
             marginsCollapseHandler.endMarginsCollapse(layoutBox);
         }
@@ -442,7 +443,6 @@ public LayoutResult layout(LayoutContext layoutContext) {
             correctPositionedLayout(layoutBox);
         }
 
-        float overflowPartHeight = getOverflowPartHeight(overflowY, layoutBox);
         applyPaddings(occupiedArea.getBBox(), paddings, true);
         applyBorderBox(occupiedArea.getBBox(), borders, true);
         if (positionedRenderers.size() > 0) {

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

@@ -289,10 +289,13 @@ public LineLayoutResult layout(LayoutContext layoutContext) {
                 setProperty(Property.OVERFLOW_X, OverflowPropertyValue.FIT);
             }
             if (childResult == null) {
-                childResult = childRenderer.layout(new LayoutContext(new LayoutArea(layoutContext.getArea().getPageNumber(), bbox)));
-            }
-            if (childPos > 0) {
-                deleteOwnProperty(Property.OVERFLOW_X);
+                if (childPos > 0) {
+                    setProperty(Property.OVERFLOW_X, OverflowPropertyValue.FIT);
+                }
+                childResult = childRenderer.layout(new LayoutContext(new LayoutArea(layoutContext.getArea().getPageNumber(), bbox, wasParentsHeightClipped)));
+                if (childPos > 0) {
+                    deleteOwnProperty(Property.OVERFLOW_X);
+                }
             }
 
             // Get back child width so that it's not lost

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

@@ -369,6 +369,7 @@ public LayoutResult layout(LayoutContext layoutContext) {
                 previousDescent = processedRenderer.getMaxDescent();
             }
         }
+        float overflowPartHeight = getOverflowPartHeight(overflowY, layoutBox);
 
         if (marginsCollapsingEnabled) {
             if (childRenderers.size() > 0 && notAllKidsAreFloats) {
@@ -411,7 +412,6 @@ public LayoutResult layout(LayoutContext layoutContext) {
             correctPositionedLayout(layoutBox);
         }
 
-        float overflowPartHeight = getOverflowPartHeight(overflowY, layoutBox);
         applyPaddings(occupiedArea.getBBox(), paddings, true);
         applyBorderBox(occupiedArea.getBBox(), borders, true);
         applyMargins(occupiedArea.getBBox(), true);

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

@@ -220,7 +220,7 @@ public LayoutResult layout(LayoutContext layoutContext) {
         TextLayoutResult result = null;
 
         OverflowPropertyValue overflowX = this.parent.<OverflowPropertyValue>getProperty(Property.OVERFLOW_X);
-        OverflowPropertyValue overflowY = null == retrieveMaxHeight() && !layoutContext.getArea().isClippedHeight() ? null : this.parent.<OverflowPropertyValue>getProperty(Property.OVERFLOW_Y);
+        OverflowPropertyValue overflowY = null == retrieveMaxHeight() && !layoutContext.getArea().isClippedHeight() ? OverflowPropertyValue.FIT : this.parent.<OverflowPropertyValue>getProperty(Property.OVERFLOW_Y);
 
         // true in situations like "\nHello World" or "Hello\nWorld"
         boolean isSplitForcedByNewLine = false;