core: #576 turned 'spacing.labelNode' into 'nodeLabels.margin'

eclipse-elk · May 19, 2020 · aaf32e1 · aaf32e1
1 parent a3b9b65
commit aaf32e1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
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
@@ -47,7 +47,6 @@ algorithm layered(LayeredLayoutProvider) {
     supports org.eclipse.elk.spacing.edgeNode
     supports org.eclipse.elk.spacing.labelLabel
     supports org.eclipse.elk.spacing.labelPort
-    supports org.eclipse.elk.spacing.labelNode
     supports org.eclipse.elk.spacing.nodeNode
     supports org.eclipse.elk.spacing.nodeSelfLoop
     supports org.eclipse.elk.spacing.portPort
@@ -103,8 +102,9 @@ algorithm layered(LayeredLayoutProvider) {
     supports org.eclipse.elk.nodeSize.constraints
     supports org.eclipse.elk.nodeSize.options
     supports org.eclipse.elk.direction = Direction.UNDEFINED
-    supports org.eclipse.elk.nodeLabels.placement
+    supports org.eclipse.elk.nodeLabels.margin
     supports org.eclipse.elk.nodeLabels.padding
+    supports org.eclipse.elk.nodeLabels.placement
     supports org.eclipse.elk.portLabels.placement
     supports org.eclipse.elk.portLabels.nextToPortIfPossible
     supports org.eclipse.elk.portLabels.treatAsGroup

diff --git a/plugins/org.eclipse.elk.core/src/org/eclipse/elk/core/Core.melk b/plugins/org.eclipse.elk.core/src/org/eclipse/elk/core/Core.melk
@@ -337,16 +337,6 @@ group spacing {
         targets parents
     }
 
-    option labelNode: double {
-        label "Label Node Spacing"
-        description
-            "Spacing to be preserved between labels and the border of node they are associated with. 
-            Note that the placement of a label is influenced by the 'nodelabels.placement' option."
-        default = 5
-        lowerBound = 0.0
-        targets parents
-    }
-
     option labelPort: double {
         label "Label Port Spacing"
         description
@@ -430,11 +420,23 @@ group partitioning {
 
 // --- NODE LABELS
 group nodeLabels {
+
+    advanced option margin: ElkMargin {
+        label "Node Label Margin"
+        description
+            "Define margin for node labels that are placed outside of a node (see 'nodeLabels.placement').
+             The margin affects not only the node's direct labels but also the labels of the node's 
+             ports and certain edges. "
+        default = new ElkMargin(5)
+        targets nodes
+    }
 
     advanced option padding: ElkPadding {
         label "Node Label Padding"
         description
-            "Define padding for node labels that are placed inside of a node."
+            "Define padding for node labels that are placed inside of a node (see 'nodeLabels.placement').
+             The padding affects not only the node's direct labels but also the labels of the node's 
+             ports and certain edges. "
         default = new ElkPadding(5)
         targets nodes
     }