Implemented bubbling

Author: jostja

source/GM-TE/GMTEEditor.class.st

@@ -373,7 +373,7 @@ GMTEEditor >> brushButtons: anObject [
 
 {
 	#category : #building,
-	#'squeak_changestamp' : 'mcjj 7/10/2024 16:51'
+	#'squeak_changestamp' : 'mcjj 7/11/2024 15:51'
 }
 GMTEEditor >> buildWith: builder [
 	"builds the editor with ToolBuilder"
@@ -394,6 +394,8 @@ GMTEEditor >> buildWith: 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').
@@ -422,8 +424,7 @@ GMTEEditor >> buildWith: builder [
 
 	self 
 		initializeDefaultTileMapMatrix;
-		associatedMorph: newMorph;
-		setupInputHandlingFor: newMorph.
+		associatedMorph: newMorph.
 
 	^ newMorph
 ]
@@ -968,15 +969,6 @@ GMTEEditor >> disableSingleLayerButtons [
 	GMTEEditor singleLayerActionNames do: [:aString | (self associatedMorph submorphNamed: aString) enabled: false ]
 ]
 
-{
-	#category : #'input handling',
-	#'squeak_changestamp' : 'mcjj 7/10/2024 16:47'
-}
-GMTEEditor >> dropKeyboardFocus: anEvent [
-	
-	anEvent hand releaseKeyboardFocus: self associatedMorph
-]
-
 {
 	#category : #'as yet unclassified',
 	#'squeak_changestamp' : 'TW 6/25/2024 17:51'
@@ -1032,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'
@@ -1106,15 +1128,6 @@ GMTEEditor >> getGridWidthAsString [
 	^ self getGridWidth asString
 ]
 
-{
-	#category : #'input handling',
-	#'squeak_changestamp' : 'mcjj 7/10/2024 16:46'
-}
-GMTEEditor >> getKeyboardFocus: anEvent [
-	
-	anEvent hand newKeyboardFocus: self associatedMorph
-]
-
 {
 	#category : #'layer manipulation',
 	#'squeak_changestamp' : 'TW 6/23/2024 21:50'
@@ -1182,18 +1195,6 @@ GMTEEditor >> getTileRatioAsString [
 	^ self getTileRatio asString
 ]
 
-{
-	#category : #'input handling',
-	#'squeak_changestamp' : 'mcjj 7/10/2024 16:49'
-}
-GMTEEditor >> handleKeyStroke: anEvent [
-
-	| keyValue |
-	keyValue := anEvent key.
-	Transcript show: keyValue
-	"keyValue = $A"
-]
-
 {
 	#category : #'menu button functions',
 	#'squeak_changestamp' : 'TW 6/23/2024 20:09'
@@ -2016,20 +2017,6 @@ GMTEEditor >> settingsMenu [
 	builder open: aMenuSpec
 ]
 
-{
-	#category : #'input handling',
-	#'squeak_changestamp' : 'mcjj 7/10/2024 16:49'
-}
-GMTEEditor >> setupInputHandlingFor: aMorph [
-
-	aMorph 
-		on: #mouseMove send: #getKeyboardFocus: to: self;
-		on: #mouseLeave send: #dropKeyboardFocus: to: self;
-		on: #keyStroke send: #handleKeyStroke: to: self.
-		
-	aMorph eventHandler wantsEveryMouseMove: true
-]
-
 {
 	#category : #'layer manipulation',
 	#'squeak_changestamp' : 'jj 6/22/2024 21:43'

source/GM-TE/GMTEEditorTileMap.class.st

@@ -172,7 +172,7 @@ GMTEEditorTileMap >> mouseMove: anEvent [
 
 {
 	#category : #'event handling',
-	#'squeak_changestamp' : 'Valentin Teutschbein 7/10/2024 13:11'
+	#'squeak_changestamp' : 'mcjj 7/11/2024 11:14'
 }
 GMTEEditorTileMap >> mouseUp: anEvent [
 
@@ -183,7 +183,8 @@ GMTEEditorTileMap >> mouseUp: anEvent [
 	self updateTiles: (indicesToAdd asCollection) inLayer: activeLayer FromEvent: anEvent.
 	self model brush resetOutputSet.
 	(self previousTileStates size > 0) ifTrue: [self saveTileEditChanges].
-	self tileSelectionSet highlightImage: (self model selectedTile).
+	self tileSelectionSet clearAllHighlightings.
+	self tileSelectionSet highlightImage: (self model selectedTile)
 ]
 
 {