Allow informing owning shapes of recursive child being rendered

OpenPonk · Nov 16, 2024 · 9d4b6b1 · 9d4b6b1
1 parent 714a80a
commit 9d4b6b1
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 11 deletions.
diff --git a/repository/OpenPonk-Core/OPController.class.st b/repository/OpenPonk-Core/OPController.class.st
@@ -85,7 +85,7 @@ OPController >> descriptionName [
 		            read: [ :me | me model name ]
 		            write: [ :me :newValue | 
 			            me model name: newValue.
-			            self diagramElement modelChanged ].
+			            self modelChanged ].
 	^ MAStringDescription new
 		  accessor: accessor;
 		  label: 'Name';
@@ -237,11 +237,11 @@ OPController >> parentWhenTargetFor: aCreatedController [
 OPController >> refreshFigure [
 
 	self
-		deprecated: 'Use #diagramElement modelChanged instead'
+		deprecated: 'Use #modelChanged instead'
 		transformWith: '`@receiver refreshFigure'
-			-> '`@receiver diagramElement modelChanged'.
+			-> '`@receiver modelChanged'.
 
-	^ self diagramElement modelChanged
+	^ self modelChanged
 ]
 
 { #category : 'deprecated' }

diff --git a/repository/OpenPonk-Core/OPDiagramElement.class.st b/repository/OpenPonk-Core/OPDiagramElement.class.st
@@ -346,19 +346,18 @@ OPDiagramElement >> ownModelElement [
 
 { #category : 'initialization' }
 OPDiagramElement >> ownedElement: aShape renderedIn: aCanvas [
-	"do nothing"
 
-
+	self recursivelyOwnedElement: aShape renderedIn: aCanvas
 ]
 
 { #category : 'initialization' }
 OPDiagramElement >> ownedElement: aShape willRenderIn: aCanvas [
 
 	self isRendered ifTrue: [
-		self
-			assert: roassalShape canvas = aCanvas
-			description:
-			'Reusing same diagram element for 2 canvases not allowed' ].
+		^ self
+			  assert: roassalShape canvas = aCanvas
+			  description:
+			  'Reusing same diagram element for 2 canvases not allowed' ].
 	self renderIn: aCanvas
 ]
 
@@ -414,6 +413,12 @@ OPDiagramElement >> pushFront [
 	self attachedShapesDo: [ :each | each pushFront ]
 ]
 
+{ #category : 'initialization' }
+OPDiagramElement >> recursivelyOwnedElement: aShape renderedIn: aCanvas [
+
+	self owningElement recursivelyOwnedElement: aShape renderedIn: aCanvas
+]
+
 { #category : 'removing' }
 OPDiagramElement >> remove [
 

diff --git a/repository/OpenPonk-Core/OPNoShape.class.st b/repository/OpenPonk-Core/OPNoShape.class.st
@@ -103,6 +103,13 @@ OPNoShape >> readSlotNamed: aName [
 	^ nil
 ]
 
+{ #category : 'initialization' }
+OPNoShape >> recursivelyOwnedElement: aShape renderedIn: aCanvas [
+	"do nothing"
+
+
+]
+
 { #category : 'removing' }
 OPNoShape >> remove [
 	"do nothing"

diff --git a/repository/OpenPonk-Spec/OPDiagramExplorer.class.st b/repository/OpenPonk-Spec/OPDiagramExplorer.class.st
@@ -98,7 +98,7 @@ OPDiagramExplorer >> showElement: aModelObject [
 		        aModelObject.
 	diagramController enableRefresh.
 	existingCtrl ifNil: [ ^ self ].
-	ctrl diagramElement modelChanged
+	ctrl modelChanged
 ]
 
 { #category : 'actions' }