Only deselect removed element, not all

OpenPonk · Nov 23, 2024 · 684a12d · 684a12d
1 parent e1c4602
commit 684a12d
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 14 deletions.
diff --git a/repository/OpenPonk-Core/OPController.class.st b/repository/OpenPonk-Core/OPController.class.st
@@ -128,6 +128,12 @@ OPController >> elementsToShowInside [
 	^ #(  )
 ]
 
+{ #category : 'as yet unclassified' }
+OPController >> ensureDeselected [
+
+	self subclassResponsibility
+]
+
 { #category : 'accessing' }
 OPController >> ensureDiagramElement [
 
@@ -329,15 +335,15 @@ OPController >> removeFigure [
 		deprecated: 'Use #removeDiagramElement instead'
 		transformWith:
 		'`@receiver removeFigure' -> '`@receiver removeDiagramElement'.
-	self diagramController deselectAll.
+	self ensureDeselected.
 	self figure remove
 ]
 
 { #category : 'destruction' }
 OPController >> removeFromDiagramController [
 
 	self diagramController ifNil: [ ^ self ].
-	self diagramController deselectAll.
+	self ensureDeselected.
 	self diagramController removeController: self
 ]
 
@@ -358,7 +364,7 @@ OPController >> removeModelElement: aModelElement [
 { #category : 'destruction' }
 OPController >> removeRender [
 
-	self diagramController deselectAll.
+	self ensureDeselected.
 	self diagramElement removeRender
 ]
 

diff --git a/repository/OpenPonk-Core/OPDiagramController.class.st b/repository/OpenPonk-Core/OPDiagramController.class.st
@@ -353,6 +353,12 @@ OPDiagramController >> ensureControllerFor: aModel [
 	^ controller
 ]
 
+{ #category : 'as yet unclassified' }
+OPDiagramController >> ensureDeselected [
+
+	self deselectAll
+]
+
 { #category : 'accessing' }
 OPDiagramController >> figureAdded: aFigure [
 

diff --git a/repository/OpenPonk-Core/OPElementController.class.st b/repository/OpenPonk-Core/OPElementController.class.st
@@ -89,6 +89,23 @@ OPElementController >> diagramElementClass [
 	^ self subclassResponsibility
 ]
 
+{ #category : 'as yet unclassified' }
+OPElementController >> ensureDeselected [
+
+	| roassalShape |
+	self isRendered ifFalse: [ ^ self ].
+	roassalShape := self roassalShape.
+	roassalShape isSelectable ifFalse: [ ^ self ].
+	roassalShape isSelected ifFalse: [ ^ self ].
+	roassalShape propertyAt: OPRSSelectable ifPresent: [ :selectable |
+		selectable clicked: roassalShape by: (RSMouseLeftClick new
+				 controlKeyPressed: true;
+				 canvas: roassalShape canvas;
+				 shape: roassalShape;
+				 position: roassalShape position;
+				 yourself) ]
+]
+
 { #category : 'accessing' }
 OPElementController >> ensureDiagramElement [
 

diff --git a/repository/OpenPonk-Spec/OPDiagramExplorer.class.st b/repository/OpenPonk-Spec/OPDiagramExplorer.class.st
@@ -52,7 +52,6 @@ OPDiagramExplorer >> hideDependentFor: aDataElement [
 { #category : 'actions' }
 OPDiagramExplorer >> hideElement: element [
 
-	diagramController deselectAll.
 	element = diagramController model
 		ifTrue: [ diagramController hideAllElements ]
 		ifFalse: [ diagramController hideModelFromDiagram: element ].
@@ -61,9 +60,8 @@ OPDiagramExplorer >> hideElement: element [
 
 { #category : 'actions' }
 OPDiagramExplorer >> hideElements: elements [
-	diagramController deselectAll.
-	elements
-		do: [ :each | diagramController hideModelFromDiagram: each ].
+
+	elements do: [ :each | diagramController hideModelFromDiagram: each ].
 	diagramController canvas signalUpdate
 ]
 
@@ -88,7 +86,6 @@ OPDiagramExplorer >> showDependentFor: aModelObject [
 OPDiagramExplorer >> showElement: aModelObject [
 
 	| existingCtrl ctrl |
-	self diagramController deselectAll.
 	aModelObject = diagramController model ifTrue: [
 		^ diagramController showAllElements ].
 	diagramController disableRefresh.
@@ -107,19 +104,18 @@ OPDiagramExplorer >> showElements: aCollectionOfModelObjects [
 
 	| ctrls existingCtrls |
 	aCollectionOfModelObjects ifEmpty: [ ^ self ].
-	self diagramController deselectAll.
 	diagramController disableRefresh.
 	existingCtrls := aCollectionOfModelObjects asArray
-		                 collect: [ :each | 
+		                 collect: [ :each |
 		                 diagramController
 			                 controllerForModel: each
 			                 ifNone: [ nil ] ]
 		                 thenSelect: [ :each | each isNotNil ].
-	ctrls := (aCollectionOfModelObjects sorted: [ :a :b | 
+	ctrls := (aCollectionOfModelObjects sorted: [ :a :b |
 		          self adapters
 			          dependsTypeOf: b
 			          on: a
-			          in: diagramController model ]) collect: [ :each | 
+			          in: diagramController model ]) collect: [ :each |
 		         diagramController showWithoutDependentInDiagramModel: each ].
 	diagramController enableRefresh
 ]
diff --git a/repository/OpenPonk-Spec/OPDiagramRemoveFigureCommand.class.st b/repository/OpenPonk-Spec/OPDiagramRemoveFigureCommand.class.st
@@ -105,8 +105,6 @@ OPDiagramRemoveFigureCommand >> executeWithConfirmation [
 OPDiagramRemoveFigureCommand >> executeWithoutConfirmation [
 
 	| allShown |
-	diagramController deselectAll.
-
 	allShown := self showDependentAndReturnOriginallyShown.
 
 	figures do: [ :each |