Consider the parent label when having child nodes for size.

Author: soerendomroes

plugins/org.eclipse.elk.alg.rectpacking/src/org/eclipse/elk/alg/rectpacking/intermediate/MinSizePreProcessor.java

@@ -9,11 +9,15 @@
  *******************************************************************************/
 package org.eclipse.elk.alg.rectpacking.intermediate;
 
+import org.eclipse.elk.alg.common.nodespacing.NodeLabelAndSizeCalculator;
 import org.eclipse.elk.alg.rectpacking.options.InternalProperties;
 import org.eclipse.elk.core.alg.ILayoutProcessor;
 import org.eclipse.elk.core.math.KVector;
 import org.eclipse.elk.core.util.ElkUtil;
 import org.eclipse.elk.core.util.IElkProgressMonitor;
+import org.eclipse.elk.core.util.adapters.ElkGraphAdapters;
+import org.eclipse.elk.core.util.adapters.GraphAdapters.GraphAdapter;
+import org.eclipse.elk.core.util.adapters.GraphAdapters.NodeAdapter;
 import org.eclipse.elk.graph.ElkNode;
 
 /**
@@ -36,7 +40,19 @@ public class MinSizePreProcessor implements ILayoutProcessor<ElkNode> {
     @Override
     public void process(ElkNode graph, IElkProgressMonitor progressMonitor) {
         progressMonitor.begin("Min Size Preprocessing", 1);
+        // Get minimum size based on children.
         KVector minSize = ElkUtil.effectiveMinSizeConstraintFor(graph);
+        
+        // Get minimum size based on labels.
+        if (graph.getParent() != null) {
+            // only possible if a parent exists.
+            GraphAdapter<?> graphAdapter = ElkGraphAdapters.adapt(graph.getParent());
+            NodeAdapter<?> nodeAdapter = ElkGraphAdapters.adaptSingleNode(graph);
+            
+            KVector minSize2 = NodeLabelAndSizeCalculator.process(graphAdapter, nodeAdapter, false, true);
+            minSize.x = Math.max(minSize.x, minSize2.x);
+            minSize.y = Math.max(minSize.y, minSize2.y);
+        }
         graph.setProperty(InternalProperties.MIN_WIDTH, minSize.x);
         graph.setProperty(InternalProperties.MIN_HEIGHT, minSize.y);
         progressMonitor.done();