Merge origin/tmm-dev into tmm-dev

Author: RedToxyl

source/GM-TE/GMTEEditor.class.st

@@ -450,13 +450,13 @@ GMTEEditor >> brushButtons: anObject [
 
 {
 	#category : #building,
-	#'squeak_changestamp' : 'mcjj 7/11/2024 16:15'
+	#'squeak_changestamp' : 'JS 7/12/2024 18:20'
 }
 GMTEEditor >> buildWith: builder [
 	"builds the editor with ToolBuilder"
 	"called it builder instead of aBuilder since every other implementation does that"
 
-	| newMorph selectedTile panel | 
+	| newMorph panel | 
 	"TODO: Build process contains a lot of magic numbers regarding relative/absolute positioning"
 	newMorph := builder build: (builder pluggableWindowSpec new
 		model: self;
@@ -485,15 +485,7 @@ GMTEEditor >> buildWith: builder [
 	panel := GMTETileContainer withParent: self tileStore.
 	self tileStore morph: panel.
 
-	selectedTile := GMTETileSelector new 
-		visible: false;
-		model:self;
-		yourself.
-		
-	"TODO: Work in progress."
-	self trayViewer morph: GMTETileTray new.
-	self trayViewer morph
-		addMorph: selectedTile.
+	self placeSelectedTileIntoTileTray.
 
 	self tileViewer 
 		borderWidth: 2;
@@ -1719,6 +1711,24 @@ GMTEEditor >> parseSize: aText [
 	[^ aText asNumber] on: NumberParserError do: [^ nil]
 ]
 
+{
+	#category : #building,
+	#'squeak_changestamp' : 'JS 7/12/2024 18:20'
+}
+GMTEEditor >> placeSelectedTileIntoTileTray [
+	
+	| selectedTile |
+	selectedTile := GMTETileSelector new 
+		visible: false;
+		name: 'selectedTile';
+		model: self;
+		yourself.
+		
+	self trayViewer morph 
+		color: Color transparent;
+		addMorph: selectedTile
+]
+
 {
 	#category : #accessing,
 	#'squeak_changestamp' : 'jj 6/22/2024 21:27'
@@ -1969,7 +1979,7 @@ GMTEEditor >> selectRectangleBrush [
 
 {
 	#category : #accessing,
-	#'squeak_changestamp' : 'Alex M 7/9/2024 15:25'
+	#'squeak_changestamp' : 'JS 7/12/2024 18:12'
 }
 GMTEEditor >> selectTile: anObject [
 	"selects a tile from the tile store"
@@ -1980,7 +1990,7 @@ GMTEEditor >> selectTile: anObject [
 	ifFalse: [
 		self selectedTile: anObject fullResolutionSprite.
 		self tileMap tileSelectionSet highlightImage: anObject fullResolutionSprite.
-		self trayViewer morph submorphs first
+		(self trayViewer morph submorphNamed: 'selectedTile')
 			visible: true;
 			updateSprite: anObject fullResolutionSprite;
 			extent: 75@75]