Merge origin/tmm-dev into tmm-dev

source/GM-TE/GMTEEditableTileMap.class.st

@@ -109,9 +109,9 @@ GMTEEditableTileMap >> tileSelectionSet: anObject [
 
 {
 	#category : #'as yet unclassified',
-	#'squeak_changestamp' : 'TW 5/22/2024 16:55'
+	#'squeak_changestamp' : 'TW 5/22/2024 17:18'
 }
 GMTEEditableTileMap >> updateTileSprite: aTile [
 
-	self model selectedTile ifNotNil: [aTile image: (self model selectedTile image scaledToSize: self tileWidth @ self tileHeight)].
+	self model selectedTile ifNotNil: [aTile updateSprite: (self model selectedTile image)].
 ]

source/GM-TE/GMTEImageMorph.class.st

@@ -1,31 +1,63 @@
 Class {
 	#name : #GMTEImageMorph,
 	#superclass : #ImageMorph,
+	#instVars : [
+		'fullResolutionSprite'
+	],
 	#category : #'GM-TE-Core'
 }
 
 {
 	#category : #'as yet unclassified',
-	#'squeak_changestamp' : 'Ivo Zilkenat 5/21/2024 19:58'
+	#'squeak_changestamp' : 'TW 5/22/2024 17:16'
 }
 GMTEImageMorph >> extent: anExtent [
 	"override ImageMorph extent functionality. ALWAYS KEEPS RATIO"
 
 	"self image: (self image scaledToSize: anExtent)."
 
-	self image: (self image scaledToSize: anExtent).
+	self image: (self fullResolutionSprite scaledToSize: anExtent).
 
 	super extent: anExtent
 ]
 
+{
+	#category : #accessing,
+	#'squeak_changestamp' : 'TW 5/22/2024 17:15'
+}
+GMTEImageMorph >> fullResolutionSprite [
+
+	^ fullResolutionSprite
+]
+
+{
+	#category : #accessing,
+	#'squeak_changestamp' : 'TW 5/22/2024 17:15'
+}
+GMTEImageMorph >> fullResolutionSprite: anObject [
+
+	fullResolutionSprite := anObject.
+]
+
 {
 	#category : #'as yet unclassified',
-	#'squeak_changestamp' : 'Ivo Zilkenat 5/21/2024 19:43'
+	#'squeak_changestamp' : 'TW 5/22/2024 17:16'
 }
 GMTEImageMorph >> setPlaceholderWithExtent: anExtent color: aColor [
 
 	| placeholderForm |
 	placeholderForm := Form extent: anExtent depth: 32.	
 	placeholderForm fillColor: aColor.
+	self fullResolutionSprite: placeholderForm.
 	self image: placeholderForm.
 ]
+
+{
+	#category : #'as yet unclassified',
+	#'squeak_changestamp' : 'TW 5/22/2024 17:18'
+}
+GMTEImageMorph >> updateSprite: anImage [
+
+	self fullResolutionSprite: anImage.
+	self extent: self extent
+]