Layered: Added fixed graph size support. (#804)

Fixes #725. Signed-off-by: Soeren Domroes <sdo@informatik.uni-kiel.de>
eclipse · Mar 21, 2022 · cdfa858 · cdfa858
1 parent 10d85dc
commit cdfa858
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/plugins/org.eclipse.elk.alg.layered/src/org/eclipse/elk/alg/layered/ElkLayered.java b/plugins/org.eclipse.elk.alg.layered/src/org/eclipse/elk/alg/layered/ElkLayered.java
@@ -155,7 +155,9 @@ public void doLayout(final LGraph lgraph, final IElkProgressMonitor monitor) {
         componentsProcessor.combine(components, lgraph);
 
         // Resize the resulting graph, according to minimal size constraints and such
-        resizeGraph(lgraph);
+        if (!lgraph.getProperty(LayeredOptions.NODE_SIZE_FIXED_GRAPH_SIZE)) {
+            resizeGraph(lgraph);
+        }
 
         theMonitor.done();
     }

diff --git a/plugins/org.eclipse.elk.alg.layered/src/org/eclipse/elk/alg/layered/Layered.melk b/plugins/org.eclipse.elk.alg.layered/src/org/eclipse/elk/alg/layered/Layered.melk
@@ -112,6 +112,7 @@ algorithm layered(LayeredLayoutProvider) {
     supports org.eclipse.elk.insideSelfLoops.yo
     supports org.eclipse.elk.nodeSize.constraints
     supports org.eclipse.elk.nodeSize.options
+    supports org.eclipse.elk.nodeSize.fixedGraphSize
     supports org.eclipse.elk.direction = Direction.UNDEFINED
     supports org.eclipse.elk.nodeLabels.placement
     supports org.eclipse.elk.nodeLabels.padding

diff --git a/...lg.layered/src/org/eclipse/elk/alg/layered/graph/transform/ElkGraphLayoutTransferrer.java b/...lg.layered/src/org/eclipse/elk/alg/layered/graph/transform/ElkGraphLayoutTransferrer.java
@@ -369,12 +369,14 @@ private void applyParentNodeLayout(final LGraph lgraph) {
                         true);
             } else {
                 // Ports have not been positioned yet - leave this for next layouter
-                ElkUtil.resizeNode(
-                        elknode,
-                        actualGraphSize.x,
-                        actualGraphSize.y,
-                        true,
-                        true);
+                if (!elknode.getProperty(LayeredOptions.NODE_SIZE_FIXED_GRAPH_SIZE)) {
+                    ElkUtil.resizeNode(
+                            elknode,
+                            actualGraphSize.x,
+                            actualGraphSize.y,
+                            true,
+                            true);
+                }
             }
         }