Merge origin/tmm-dev into tmm-dev

Author: JoRost

source/GM-TE/GMTEEditor.class.st

@@ -373,7 +373,7 @@ GMTEEditor >> brushButtons: anObject [
 
 {
 	#category : #building,
-	#'squeak_changestamp' : 'TW 7/9/2024 18:15'
+	#'squeak_changestamp' : 'mcjj 7/11/2024 16:15'
 }
 GMTEEditor >> buildWith: builder [
 	"builds the editor with ToolBuilder"
@@ -393,7 +393,9 @@ GMTEEditor >> buildWith: builder [
 			self createInspectorSpecWithBuilder: builder};
 		closeAction: #onClose;
 		minimumExtent: GMTEEditor editorMinimumExtent).
-			
+	
+	newMorph addKeyboardCaptureFilter: self.
+	
 	self commandBar: (newMorph submorphNamed: 'command bar').
 	"self commandBar vResizing: #rigid."
 	self tileStore: (newMorph submorphNamed: 'tile store').
@@ -1022,6 +1024,36 @@ GMTEEditor >> exportMenu [
 	builder open: aMenuSpec
 ]
 
+{
+	#category : #'input handling',
+	#'squeak_changestamp' : 'mcjj 7/11/2024 15:57'
+}
+GMTEEditor >> filterEvent: aKeyboardEvent for: anObject [
+	| key |
+	
+	aKeyboardEvent isKeystroke
+		ifFalse: [^ aKeyboardEvent].
+	
+	key := aKeyboardEvent key.
+	
+	aKeyboardEvent commandKeyPressed ifTrue: [
+		aKeyboardEvent shiftPressed
+			ifTrue: [
+				key caseOf: {
+					[$Z] -> [self redo].
+				} otherwise: [^ aKeyboardEvent "no hit"].
+				^ aKeyboardEvent ignore "hit"]
+			ifFalse: [
+				key caseOf: {
+					[$Z] -> [self undo].
+					[$Y] -> [self redo].
+					[$R] -> [self rotateSelectedTile].
+				} otherwise: [^ aKeyboardEvent "no hit"].
+				^ aKeyboardEvent ignore "hit"]].
+	
+	^ aKeyboardEvent "no hit"
+]
+
 {
 	#category : #accessing,
 	#'squeak_changestamp' : 'TW 7/9/2024 17:14'

source/GM-TE/GMTEEditorTileMap.class.st

@@ -153,7 +153,7 @@ GMTEEditorTileMap >> mouseMove: anEvent [
 
 {
 	#category : #'event handling',
-	#'squeak_changestamp' : 'JS 7/11/2024 14:11'
+	#'squeak_changestamp' : 'mcjj 7/11/2024 16:20'
 }
 GMTEEditorTileMap >> mouseUp: anEvent [
 
@@ -164,7 +164,9 @@ GMTEEditorTileMap >> mouseUp: anEvent [
 	self updateTiles: (indicesToAdd asCollection) inLayer: activeLayer FromEvent: anEvent.
 	self model brush resetOutputSet.
 	(self previousTileStates isEmpty) ifFalse: [self saveTileEditChanges].
+	self tileSelectionSet clearAllHighlightings.
 	self tileSelectionSet highlightImage: (self model selectedTile)
+
 ]
 
 {