Generalize logic of bidi reordering for non-text elements. Minor refactoring

DEVSIX-1053

Autoported commit.
Original commit hash: [8f20ec7]

Author: Snipx

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

@@ -713,9 +713,6 @@ protected internal virtual void AddAllProperties(IDictionary<int, Object> proper
         }
 
         protected internal virtual float? GetLastYLineRecursively() {
-            if (childRenderers.Count == 0) {
-                return null;
-            }
             for (int i = childRenderers.Count - 1; i >= 0; i--) {
                 IRenderer child = childRenderers[i];
                 if (child is iText.Layout.Renderer.AbstractRenderer) {

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

@@ -237,24 +237,21 @@ public override LayoutResult Layout(LayoutContext layoutContext) {
                 bool isInlineBlockChild = IsInlineBlockChild(childRenderer);
                 if (!childWidthWasReplaced) {
                     if (isInlineBlockChild && childRenderer is AbstractRenderer) {
-                        childBlockMinMaxWidth = ((AbstractRenderer)childRenderer).GetMinMaxWidth(layoutContext.GetArea().GetBBox()
-                            .GetWidth());
+                        childBlockMinMaxWidth = ((AbstractRenderer)childRenderer).GetMinMaxWidth(MinMaxWidthUtils.GetMax());
                         float childMaxWidth = childBlockMinMaxWidth.GetMaxWidth() + MIN_MAX_WIDTH_CORRECTION_EPS;
                         // Decrease the calculated width by margins, paddings and borders so that even for 100% width the content definitely fits
                         // TODO DEVSIX-1174 fix depending on box-sizing
-                        if (childBlockMinMaxWidth != null) {
-                            if (childMaxWidth > bbox.GetWidth() && bbox.GetWidth() != layoutContext.GetArea().GetBBox().GetWidth()) {
-                                childResult = new LineLayoutResult(LayoutResult.NOTHING, null, null, childRenderer, childRenderer);
-                            }
-                            else {
-                                if (bbox.GetWidth() == layoutContext.GetArea().GetBBox().GetWidth() && childBlockMinMaxWidth.GetMinWidth()
-                                     > layoutContext.GetArea().GetBBox().GetWidth()) {
-                                    LoggerFactory.GetLogger(typeof(LineRenderer)).Warn(iText.IO.LogMessageConstant.INLINE_BLOCK_ELEMENT_WILL_BE_CLIPPED
-                                        );
-                                    childRenderer.SetProperty(Property.FORCED_PLACEMENT, true);
-                                }
-                                bbox.SetWidth(childMaxWidth);
+                        if (childMaxWidth > bbox.GetWidth() && bbox.GetWidth() != layoutContext.GetArea().GetBBox().GetWidth()) {
+                            childResult = new LineLayoutResult(LayoutResult.NOTHING, null, null, childRenderer, childRenderer);
+                        }
+                        else {
+                            if (bbox.GetWidth() == layoutContext.GetArea().GetBBox().GetWidth() && childBlockMinMaxWidth.GetMinWidth()
+                                 > layoutContext.GetArea().GetBBox().GetWidth()) {
+                                LoggerFactory.GetLogger(typeof(LineRenderer)).Warn(iText.IO.LogMessageConstant.INLINE_BLOCK_ELEMENT_WILL_BE_CLIPPED
+                                    );
+                                childRenderer.SetProperty(Property.FORCED_PLACEMENT, true);
                             }
+                            bbox.SetWidth(Math.Min(childMaxWidth, layoutContext.GetArea().GetBBox().GetWidth()));
                         }
                     }
                 }
@@ -480,7 +477,7 @@ public override LayoutResult Layout(LayoutContext layoutContext) {
                     IList<LineRenderer.RendererGlyph> lineGlyphs = new List<LineRenderer.RendererGlyph>();
                     // We shouldn't forget about images, float, inline-blocks that has to be inserted somewhere.
                     // TODO determine correct place to insert this content. Probably consider inline floats separately.
-                    IDictionary<TextRenderer, IRenderer> insertAfter = new Dictionary<TextRenderer, IRenderer>();
+                    IDictionary<TextRenderer, IList<IRenderer>> insertAfter = new Dictionary<TextRenderer, IList<IRenderer>>();
                     IList<IRenderer> starterNonTextRenderers = new List<IRenderer>();
                     TextRenderer lastTextRenderer = null;
                     foreach (IRenderer child in children) {
@@ -500,7 +497,10 @@ public override LayoutResult Layout(LayoutContext layoutContext) {
                         }
                         else {
                             if (lastTextRenderer != null) {
-                                insertAfter.Put(lastTextRenderer, child);
+                                if (!insertAfter.ContainsKey(lastTextRenderer)) {
+                                    insertAfter.Put(lastTextRenderer, new List<IRenderer>());
+                                }
+                                insertAfter.Get(lastTextRenderer).Add(child);
                             }
                             else {
                                 starterNonTextRenderers.Add(child);
@@ -528,7 +528,7 @@ public override LayoutResult Layout(LayoutContext layoutContext) {
                             children.Add(newRenderer);
                             // Insert non-text renderers
                             if (insertAfter.ContainsKey((TextRenderer)renderer)) {
-                                children.Add(insertAfter.Get((TextRenderer)renderer));
+                                children.AddAll(insertAfter.Get((TextRenderer)renderer));
                                 insertAfter.JRemove((TextRenderer)renderer);
                             }
                             newRenderer.line = new GlyphLine(newRenderer.line);

port-hash

@@ -1 +1 @@
-d8ad5373ea5e46537543a246ee837dc1a00e662f
+8f20ec717f5590d6e03e8a39c277ad2fd5d3de85