Rectpacking: Fixed bug that padding describes the minimum size.

Signed-off-by: Soeren Domroes <sdo@informatik.uni-kiel.de>
eclipse-elk · Apr 11, 2022 · 66d92bd · 66d92bd
1 parent 2bb24cf
commit 66d92bd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/...se.elk.alg.rectpacking/src/org/eclipse/elk/alg/rectpacking/RectPackingLayoutProvider.java b/...se.elk.alg.rectpacking/src/org/eclipse/elk/alg/rectpacking/RectPackingLayoutProvider.java
@@ -138,7 +138,7 @@ public void layout(final ElkNode layoutGraph, final IElkProgressMonitor progress
             maxWidth = Math.max(minSize.x, drawing.getDrawingWidth());
 
             // Run placement, compaction, and expansion (if enabled).
-            drawing = secondIt.start(rectangles, maxWidth, minSize, progressMonitor, layoutGraph);
+            drawing = secondIt.start(rectangles, maxWidth, minSize, progressMonitor, layoutGraph, padding);
         }
 
         // Final touch.

diff --git a/...tpacking/src/org/eclipse/elk/alg/rectpacking/seconditeration/RowFillingAndCompaction.java b/...tpacking/src/org/eclipse/elk/alg/rectpacking/seconditeration/RowFillingAndCompaction.java
@@ -16,6 +16,7 @@
 import org.eclipse.elk.alg.rectpacking.util.DrawingData;
 import org.eclipse.elk.alg.rectpacking.util.DrawingDataDescriptor;
 import org.eclipse.elk.alg.rectpacking.util.RectRow;
+import org.eclipse.elk.core.math.ElkPadding;
 import org.eclipse.elk.core.math.KVector;
 import org.eclipse.elk.core.util.IElkProgressMonitor;
 import org.eclipse.elk.graph.ElkNode;
@@ -69,7 +70,7 @@ public RowFillingAndCompaction(final double aspectRatio, final boolean expandNod
      * @return Drawing data for a produced drawing.
      */
     public DrawingData start(final List<ElkNode> rectangles, final double maxWidth, final KVector minParentSize,
-            final IElkProgressMonitor progressMonitor, final ElkNode layoutGraph) {
+            final IElkProgressMonitor progressMonitor, final ElkNode layoutGraph, final ElkPadding padding) {
         // Initial placement for rectangles in blocks in each row.
         List<RectRow> rows = InitialPlacement.place(rectangles, maxWidth, nodeNodeSpacing);
 
@@ -107,8 +108,8 @@ public DrawingData start(final List<ElkNode> rectangles, final double maxWidth,
             progressMonitor.logGraph(layoutGraph, "After compaction");
         }
 
-        double totalWidth = Math.max(this.drawingWidth, minParentSize.x);
-        double minHeight = Math.max(this.drawingHeight, minParentSize.y);
+        double totalWidth = Math.max(this.drawingWidth, minParentSize.x - padding.getHorizontal());
+        double minHeight = Math.max(this.drawingHeight, minParentSize.y - padding.getVertical());
         double additionalHeight = minHeight - this.drawingHeight;
         if (expandNodes && expandToAspectRatio) {
             double aspectRatio = totalWidth / minHeight;