Process paragraph margins correctly. Fixes in overflow with floats processing. Delete unnecessary layout methods.

DEVSIX-992

Autoported commit.
Original commit hash: [2b3980f]

Author: ars18wrw

itext/itext.layout/itext/layout/element/BlockElement.cs

@@ -353,34 +353,6 @@ public virtual T SetMinHeight(float minHeight) {
             return (T)(Object)this;
         }
 
-        /// <summary>Sets the overflow-x value.</summary>
-        /// 
-        /// <returns>this element</returns>
-        public virtual T SetOverflowX(OverflowPropertyValue? overflow) {
-            SetProperty(Property.OVERFLOW_X, overflow);
-            return (T)(Object)this;
-        }
-
-        /// <summary>Sets the overflow-y value.</summary>
-        /// 
-        /// <returns>this element</returns>
-        public virtual T SetOverflowY(OverflowPropertyValue? overflow) {
-            SetProperty(Property.OVERFLOW_Y, overflow);
-            return (T)(Object)this;
-        }
-
-        /// <summary>Gets the overflow-x value of the element.</summary>
-        /// <returns>the overflow-x value of the element.</returns>
-        public virtual OverflowPropertyValue? GetOverflowX() {
-            return this.GetProperty<OverflowPropertyValue?>(Property.OVERFLOW_X);
-        }
-
-        /// <summary>Gets the overflow-y value of the element.</summary>
-        /// <returns>the overflow-y value of the element.</returns>
-        public virtual OverflowPropertyValue? GetOverflowY() {
-            return this.GetProperty<OverflowPropertyValue?>(Property.OVERFLOW_Y);
-        }
-
         public abstract AccessibilityProperties GetAccessibilityProperties();
 
         public abstract PdfName GetRole();

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

@@ -77,13 +77,17 @@ public override LayoutResult Layout(LayoutContext layoutContext) {
             Rectangle layoutBox = layoutContext.GetArea().GetBBox().Clone();
             bool wasParentsHeightClipped = layoutContext.GetArea().IsClippedHeight();
             IList<Rectangle> floatRendererAreas = layoutContext.GetFloatRendererAreas();
+            OverflowPropertyValue? oldXOverflow = null;
+            bool wasXOverflowChanged = false;
             if (floatRendererAreas != null) {
+                float layoutWidth = layoutBox.GetWidth();
                 FloatingHelper.AdjustLineAreaAccordingToFloats(floatRendererAreas, layoutBox);
-                if (0 != floatRendererAreas.Count) {
+                if (layoutWidth > layoutBox.GetWidth()) {
+                    oldXOverflow = this.GetProperty<OverflowPropertyValue?>(Property.OVERFLOW_X);
+                    wasXOverflowChanged = true;
                     SetProperty(Property.OVERFLOW_X, OverflowPropertyValue.FIT);
                 }
             }
-            // TODO
             occupiedArea = new LayoutArea(layoutContext.GetArea().GetPageNumber(), layoutBox.Clone().MoveUp(layoutBox.
                 GetHeight()).SetHeight(0).SetWidth(0));
             float curWidth = 0;
@@ -175,15 +179,14 @@ public override LayoutResult Layout(LayoutContext layoutContext) {
                     // when floating span is split on other line;
                     // TODO may be process floating spans as inline blocks always?
                     if (childPos > 0) {
+                        oldXOverflow = this.GetProperty<OverflowPropertyValue?>(Property.OVERFLOW_X);
+                        wasXOverflowChanged = true;
                         SetProperty(Property.OVERFLOW_X, OverflowPropertyValue.FIT);
                     }
                     if (overflowFloats.IsEmpty() && (!anythingPlaced || floatingBoxFullWidth <= bbox.GetWidth())) {
                         childResult = childRenderer.Layout(new LayoutContext(new LayoutArea(layoutContext.GetArea().GetPageNumber(
                             ), layoutContext.GetArea().GetBBox().Clone(), wasParentsHeightClipped), null, floatRendererAreas));
                     }
-                    if (childPos > 0) {
-                        DeleteOwnProperty(Property.OVERFLOW_X);
-                    }
                     // Get back child width so that it's not lost
                     if (childWidthWasReplaced) {
                         if (childRendererHasOwnWidthProperty) {
@@ -272,13 +275,12 @@ public override LayoutResult Layout(LayoutContext layoutContext) {
                 }
                 if (childResult == null) {
                     if (childPos > 0) {
+                        oldXOverflow = this.GetProperty<OverflowPropertyValue?>(Property.OVERFLOW_X);
+                        wasXOverflowChanged = true;
                         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
                 if (childWidthWasReplaced) {
@@ -621,16 +623,13 @@ public override LayoutResult Layout(LayoutContext layoutContext) {
                 processed.AdjustChildrenYLine().TrimLast();
                 result.SetMinMaxWidth(minMaxWidth);
             }
-            if (floatRendererAreas != null) {
-                if (0 != floatRendererAreas.Count) {
-                    DeleteOwnProperty(Property.OVERFLOW_X);
-                    // TODO
-                    if (null != result.GetSplitRenderer()) {
-                        result.GetSplitRenderer().DeleteOwnProperty(Property.OVERFLOW_X);
-                    }
-                    if (null != result.GetOverflowRenderer()) {
-                        result.GetOverflowRenderer().DeleteOwnProperty(Property.OVERFLOW_X);
-                    }
+            if (wasXOverflowChanged) {
+                SetProperty(Property.OVERFLOW_X, oldXOverflow);
+                if (null != result.GetSplitRenderer()) {
+                    result.GetSplitRenderer().SetProperty(Property.OVERFLOW_X, oldXOverflow);
+                }
+                if (null != result.GetOverflowRenderer()) {
+                    result.GetOverflowRenderer().SetProperty(Property.OVERFLOW_X, oldXOverflow);
                 }
             }
             return result;

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

@@ -378,6 +378,13 @@ public override LayoutResult Layout(LayoutContext layoutContext) {
                     previousDescent = processedRenderer.GetMaxDescent();
                 }
             }
+            float moveDown = lastLineBottomLeadingIndent;
+            if ((null == overflowY || OverflowPropertyValue.FIT.Equals(overflowY)) && moveDown > occupiedArea.GetBBox(
+                ).GetY() - layoutBox.GetY()) {
+                moveDown = occupiedArea.GetBBox().GetY() - layoutBox.GetY();
+            }
+            occupiedArea.GetBBox().MoveDown(moveDown);
+            occupiedArea.GetBBox().SetHeight(occupiedArea.GetBBox().GetHeight() + moveDown);
             float overflowPartHeight = GetOverflowPartHeight(overflowY, layoutBox);
             if (marginsCollapsingEnabled) {
                 if (childRenderers.Count > 0 && notAllKidsAreFloats) {
@@ -388,13 +395,6 @@ public override LayoutResult Layout(LayoutContext layoutContext) {
             if (FloatingHelper.IsRendererFloating(this, floatPropertyValue)) {
                 FloatingHelper.IncludeChildFloatsInOccupiedArea(floatRendererAreas, this);
             }
-            float moveDown = lastLineBottomLeadingIndent;
-            if ((null == overflowY || OverflowPropertyValue.FIT.Equals(overflowY)) && moveDown > occupiedArea.GetBBox(
-                ).GetY() - layoutBox.GetY()) {
-                moveDown = occupiedArea.GetBBox().GetY() - layoutBox.GetY();
-            }
-            occupiedArea.GetBBox().MoveDown(moveDown);
-            occupiedArea.GetBBox().SetHeight(occupiedArea.GetBBox().GetHeight() + moveDown);
             IRenderer overflowRenderer = null;
             float? blockMinHeight = RetrieveMinHeight();
             if (null != blockMinHeight && blockMinHeight > occupiedArea.GetBBox().GetHeight()) {

port-hash

@@ -1 +1 @@
-707e41a9d7acaca7287322b9d5f5df84df6dfc0e
+2b3980fe433a1ae12951c10f99b73f61207669e7