Reworked remove shortcut

repository/OpenPonk-Spec/HandMorph.extension.st

@@ -0,0 +1,20 @@
+Extension { #name : #HandMorph }
+
+{ #category : #'*OpenPonk-Spec' }
+HandMorph >> sendKeyboardEvent: anEvent [
+
+	OPDiagramRemoveFigureCommand lastEvent: anEvent.
+	"Send the event to the morph currently holding the focus, or if none to
+	the owner of the hand."
+	^ self
+		sendEvent: anEvent
+		focus: self keyboardFocus
+		clear: [self keyboardFocus: nil]
+]
+
+{ #category : #'*OpenPonk-Spec' }
+HandMorph >> sendMouseEvent: anEvent [
+	OPDiagramRemoveFigureCommand lastEvent: anEvent.
+	"Send the event to the morph currently holding the focus, or if none to the owner of the hand."
+	^self sendEvent: anEvent focus: self mouseFocus clear:[self mouseFocus: nil]
+]

repository/OpenPonk-Spec/OPDiagramFigureCommand.class.st

@@ -12,6 +12,9 @@ Class {
 		'controllers',
 		'diagramElements'
 	],
+	#classInstVars : [
+		'lastEvent'
+	],
 	#category : #'OpenPonk-Spec-Diagram-Figure-Commands'
 }
 

repository/OpenPonk-Spec/OPDiagramRemoveFigureCommand.class.st

@@ -16,12 +16,27 @@ OPDiagramRemoveFigureCommand class >> canvasShortcutActivation [
 
 	<classAnnotation>
 	^ CmdShortcutActivation
-		  by: ((KMSingleKeyCombination new key:
-				    (KeyboardKey new withValue: 16rffff andName: #delete))
-				   modifiedBy: KMModifier meta)
+		  by: (KMKeyCombinationChoice withShortcuts: {
+					   (KMSingleKeyCombination new key:
+						    (KeyboardKey new withValue: 16rffff andName: #delete)).
+					   ((KMSingleKeyCombination new key:
+						     (KeyboardKey new withValue: 16rffff andName: #delete))
+						    modifiedBy: KMModifier meta) })
 		  for: OPCanvasPresenter
 ]
 
+{ #category : #accessing }
+OPDiagramRemoveFigureCommand class >> lastEvent [
+
+	^ lastEvent
+]
+
+{ #category : #accessing }
+OPDiagramRemoveFigureCommand class >> lastEvent: anEvent [
+
+	lastEvent := anEvent
+]
+
 { #category : #accessing }
 OPDiagramRemoveFigureCommand >> defaultMenuIcon [
 
@@ -36,13 +51,50 @@ OPDiagramRemoveFigureCommand >> defaultMenuItemName [
 		  ifFalse: [ 'Remove all ' , models size asString , ' from model' ]
 ]
 
+{ #category : #utilities }
+OPDiagramRemoveFigureCommand >> doAndReturnFocus: aBlock [
+
+	| result window wasActive |
+	window := diagramController canvasPresenter window window.
+	wasActive := window isActive.
+	result := aBlock value.
+	window activate.
+	^ result
+]
+
 { #category : #execution }
 OPDiagramRemoveFigureCommand >> execute [
 
+	| lastEvent |
+	lastEvent := self class lastEvent.
+	(lastEvent isNotNil and: [
+		 lastEvent controlKeyPressed or: [ lastEvent commandKeyPressed ] ])
+		ifTrue: [ self unsafeExecute ]
+		ifFalse: [ self safeExecute ]
+]
+
+{ #category : #execution }
+OPDiagramRemoveFigureCommand >> safeExecute [
+
+	| result |
+	result := self doAndReturnFocus: [
+		          UIManager default
+			          proceed:
+				          'Permanently remove from model? (to skip this confirmation, hold '
+				          , OSPlatform current defaultModifier name
+				          , ' next time)'
+			          title: 'Remove?' ].
+	result ifNil: [ ^ self ].
+	result ifFalse: [ ^ self ].
+	self unsafeExecute
+]
+
+{ #category : #execution }
+OPDiagramRemoveFigureCommand >> unsafeExecute [
+
 	diagramController deselectAll.
 	figures do: [ :each |
 		(diagramController hasControllerForFigure: each) ifTrue: [
 			diagramController removeFromCanvas: each ] ].
-	"diagramController selectedElements do: [ :each | diagramController removeFromCanvas: each]."
 	canvas signalUpdate
 ]