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

DEVSIX-992

Autoported commit.
Original commit hash: [707e41a]

Author: ars18wrw

itext/itext.layout/itext/layout/renderer/AbstractRenderer.cs

@@ -1275,23 +1275,25 @@ protected internal virtual void AlignChildHorizontally(IRenderer childRenderer,
                 );
             if (horizontalAlignment != null && horizontalAlignment != HorizontalAlignment.LEFT) {
                 float freeSpace = availableWidth - childRenderer.GetOccupiedArea().GetBBox().GetWidth();
-                try {
-                    switch (horizontalAlignment) {
-                        case HorizontalAlignment.RIGHT: {
-                            childRenderer.Move(freeSpace, 0);
-                            break;
-                        }
+                if (freeSpace > 0) {
+                    try {
+                        switch (horizontalAlignment) {
+                            case HorizontalAlignment.RIGHT: {
+                                childRenderer.Move(freeSpace, 0);
+                                break;
+                            }
 
-                        case HorizontalAlignment.CENTER: {
-                            childRenderer.Move(freeSpace / 2, 0);
-                            break;
+                            case HorizontalAlignment.CENTER: {
+                                childRenderer.Move(freeSpace / 2, 0);
+                                break;
+                            }
                         }
                     }
-                }
-                catch (Exception) {
-                    ILogger logger = LoggerFactory.GetLogger(typeof(iText.Layout.Renderer.AbstractRenderer));
-                    logger.Error(MessageFormatUtil.Format(iText.IO.LogMessageConstant.OCCUPIED_AREA_HAS_NOT_BEEN_INITIALIZED, 
-                        "Some of the children might not end up aligned horizontally."));
+                    catch (ArgumentNullException) {
+                        ILogger logger = LoggerFactory.GetLogger(typeof(iText.Layout.Renderer.AbstractRenderer));
+                        logger.Error(MessageFormatUtil.Format(iText.IO.LogMessageConstant.OCCUPIED_AREA_HAS_NOT_BEEN_INITIALIZED, 
+                            "Some of the children might not end up aligned horizontally."));
+                    }
                 }
             }
         }

itext/itext.layout/itext/layout/renderer/BlockRenderer.cs

@@ -357,6 +357,7 @@ public override LayoutResult Layout(LayoutContext layoutContext) {
                     causeOfNothing = result.GetCauseOfNothing();
                 }
             }
+            float overflowPartHeight = GetOverflowPartHeight(overflowY, layoutBox);
             if (marginsCollapsingEnabled && !isCellRenderer) {
                 marginsCollapseHandler.EndMarginsCollapse(layoutBox);
             }
@@ -413,7 +414,6 @@ public override LayoutResult Layout(LayoutContext layoutContext) {
             if (isPositioned) {
                 CorrectPositionedLayout(layoutBox);
             }
-            float overflowPartHeight = GetOverflowPartHeight(overflowY, layoutBox);
             ApplyPaddings(occupiedArea.GetBBox(), paddings, true);
             ApplyBorderBox(occupiedArea.GetBBox(), borders, true);
             if (positionedRenderers.Count > 0) {

itext/itext.layout/itext/layout/renderer/LineRenderer.cs

@@ -271,11 +271,14 @@ public override LayoutResult Layout(LayoutContext layoutContext) {
                     SetProperty(Property.OVERFLOW_X, OverflowPropertyValue.FIT);
                 }
                 if (childResult == null) {
+                    if (childPos > 0) {
+                        SetProperty(Property.OVERFLOW_X, OverflowPropertyValue.FIT);
+                    }
                     childResult = childRenderer.Layout(new LayoutContext(new LayoutArea(layoutContext.GetArea().GetPageNumber(
-                        ), bbox)));
-                }
-                if (childPos > 0) {
-                    DeleteOwnProperty(Property.OVERFLOW_X);
+                        ), bbox, wasParentsHeightClipped)));
+                    if (childPos > 0) {
+                        DeleteOwnProperty(Property.OVERFLOW_X);
+                    }
                 }
                 // Get back child width so that it's not lost
                 if (childWidthWasReplaced) {

itext/itext.layout/itext/layout/renderer/ParagraphRenderer.cs

@@ -378,6 +378,7 @@ public override LayoutResult Layout(LayoutContext layoutContext) {
                     previousDescent = processedRenderer.GetMaxDescent();
                 }
             }
+            float overflowPartHeight = GetOverflowPartHeight(overflowY, layoutBox);
             if (marginsCollapsingEnabled) {
                 if (childRenderers.Count > 0 && notAllKidsAreFloats) {
                     marginsCollapseHandler.EndChildMarginsHandling(layoutBox);
@@ -418,7 +419,6 @@ public override LayoutResult Layout(LayoutContext layoutContext) {
             if (isPositioned) {
                 CorrectPositionedLayout(layoutBox);
             }
-            float overflowPartHeight = GetOverflowPartHeight(overflowY, layoutBox);
             ApplyPaddings(occupiedArea.GetBBox(), paddings, true);
             ApplyBorderBox(occupiedArea.GetBBox(), borders, true);
             ApplyMargins(occupiedArea.GetBBox(), true);

itext/itext.layout/itext/layout/renderer/TextRenderer.cs

@@ -192,7 +192,7 @@ public override LayoutResult Layout(LayoutContext layoutContext) {
             TextLayoutResult result = null;
             OverflowPropertyValue? overflowX = this.parent.GetProperty<OverflowPropertyValue?>(Property.OVERFLOW_X);
             OverflowPropertyValue? overflowY = null == RetrieveMaxHeight() && !layoutContext.GetArea().IsClippedHeight
-                () ? null : this.parent.GetProperty<OverflowPropertyValue?>(Property.OVERFLOW_Y);
+                () ? OverflowPropertyValue.FIT : this.parent.GetProperty<OverflowPropertyValue?>(Property.OVERFLOW_Y);
             // true in situations like "\nHello World" or "Hello\nWorld"
             bool isSplitForcedByNewLine = false;
             // needed in situation like "\nHello World" or " Hello World", when split occurs on first character, but we want to leave it on previous line

port-hash

@@ -1 +1 @@
-8bfe5735198d8407b57ba94f55c551e3c1d12253
+707e41a9d7acaca7287322b9d5f5df84df6dfc0e