update layout algo

src/Roassal-Layouts-Util/RSLayoutNode.class.st

@@ -12,7 +12,8 @@ Class {
 		'children',
 		'model',
 		'connectedLines',
-		'parent'
+		'parent',
+		'properties'
 	],
 	#category : #'Roassal-Layouts-Util'
 }
@@ -199,6 +200,24 @@ RSLayoutNode >> position: aPoint [
 	position := aPoint
 ]
 
+{ #category : #accessing }
+RSLayoutNode >> propertyAt: key [
+	properties ifNil: [ ^ nil ].
+	^ properties at: key
+]
+
+{ #category : #accessing }
+RSLayoutNode >> propertyAt: key ifAbsent: aBlock [
+	properties ifNil: [ ^ aBlock value ].
+	^ properties at: key ifAbsent: aBlock
+]
+
+{ #category : #accessing }
+RSLayoutNode >> propertyAt: key put: anObject [
+	properties ifNil: [ properties := Dictionary new ].
+	^ properties at: key put: anObject
+]
+
 { #category : #actions }
 RSLayoutNode >> remove [
 	parent ifNil: [ ^ self ].

src/Roassal-Layouts/RSConditionalLayout.class.st

@@ -45,7 +45,7 @@ RSConditionalLayout >> doExecute: shapes [
 	thenLayout on: thenShapes.
 	elseLayout on: elseShapes.
 
-	clusterLayout on: { thenShapes. elseShapes }.
+	clusterLayout on: { thenShapes. elseShapes } asGroup.
 ]
 
 { #category : #accessing }

src/Roassal-Layouts/RSTWalkBasedRegularTreeLayout.trait.st

@@ -220,10 +220,11 @@ RSTWalkBasedRegularTreeLayout >> initialize: elements associationEdges: associat
 
 		multipleParents ifFalse: [ children add: child ] ].
 
-	rootNode := roots size > 1 ifTrue: [ | rootShape |
+	rootNode := roots size > 1 ifTrue: [
 		roots do: [ :each | self assert: (fathers includesKey: each) not ].
-		rootShape := elements anyOne class new.
-		self childrenOf: rootShape put: roots asArray
+		RSLayoutNode new
+			in: [ :aRootNode | self childrenOf: aRootNode put: roots asArray ];
+			yourself
 	] ifFalse: [ roots anyOne ].
 
 	leaves do: [ :each |