Do not remove render of controllers not in diagram controller

OpenPonk · Nov 23, 2024 · a1a861b · a1a861b
1 parent bbdac18
commit a1a861b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/repository/OpenPonk-Core/OPController.class.st b/repository/OpenPonk-Core/OPController.class.st
@@ -270,8 +270,8 @@ OPController >> removeController [
 		self
 			removeDependentControllers;
 			internalUnsubscribeFrom: m ].
-	self removeFromDiagramController.
-	self removeRender
+	self removeRender.
+	self removeFromDiagramController
 ]
 
 { #category : 'destruction' }

diff --git a/repository/OpenPonk-Spec/OPSelectionTool.class.st b/repository/OpenPonk-Spec/OPSelectionTool.class.st
@@ -40,12 +40,12 @@ OPSelectionTool >> select [
 OPSelectionTool >> selectedControllers: aCollectionOfControllers [
 
 	| originalFigures newFigures |
-	originalFigures := selectedControllers collect: #roassalShape.
+	originalFigures := selectedControllers
+		                   select: #isRendered
+		                   thenCollect: #roassalShape.
 	newFigures := aCollectionOfControllers collect: #roassalShape.
-	originalFigures , newFigures
-		detect: #isSelectable
-		ifFound: [ :fig | 
-			(fig propertyAt: OPRSSelectable) doHighlightShapes: newFigures ].
+	originalFigures , newFigures detect: #isSelectable ifFound: [ :fig |
+		(fig propertyAt: OPRSSelectable) doHighlightShapes: newFigures ].
 	selectedControllers := aCollectionOfControllers.
 	self editor openFormOn: (aCollectionOfControllers size = 1
 			 ifTrue: [ aCollectionOfControllers anyOne ]