Merge origin/tmm-dev into tmm-dev

hpi-swa-teaching · Jul 11, 2024 · 6d62505 · 6d62505
2 parents 9beb79e + 0bbff03
commit 6d62505
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/source/GM-TE/GMTEEditor.class.st b/source/GM-TE/GMTEEditor.class.st
@@ -637,7 +637,7 @@ GMTEEditor >> createCommandBarSpecWithBuilder: aBuilder [
 
 {
 	#category : #building,
-	#'squeak_changestamp' : 'jj 6/22/2024 20:42'
+	#'squeak_changestamp' : 'tw 7/11/2024 17:48'
 }
 GMTEEditor >> createInspectorSpecWithBuilder: aBuilder [
 	"creates the spec for the inspector tab"
@@ -652,8 +652,6 @@ GMTEEditor >> createInspectorSpecWithBuilder: aBuilder [
 		children: {
 		self createAttributeSpecWithBuilder: aBuilder descriptor: 'Padding:' getter: #getPaddingAsString setter: #setPadding: model: self.
 
-		self createAttributeSpecWithBuilder: aBuilder descriptor: 'Tile Ratio:' getter: #getTileRatioAsString setter: #setTileRatio: model: self.
-
 		self createAttributeSpecWithBuilder: aBuilder descriptor: 'Grid Width:' getter: #getGridWidthAsString setter: #setGridWidth: model: self.
 
 		self createAttributeSpecWithBuilder: aBuilder descriptor: 'Grid Height:' getter: #getGridHeightAsString setter: #setGridHeight: model: self
@@ -665,14 +663,15 @@ GMTEEditor >> createInspectorSpecWithBuilder: aBuilder [
 
 {
 	#category : #building,
-	#'squeak_changestamp' : 'Alex M 7/10/2024 02:14'
+	#'squeak_changestamp' : 'Alex M 7/11/2024 18:04'
 }
 GMTEEditor >> createLayersSpecWithBuilder: aBuilder [
 	"creates the spec for layer viewer"
 
 	^ (aBuilder pluggablePanelSpec new)
 		name: 'layer viewer';
 		model: self;
+		minimumExtent:150 @ 150;
 		frame: (LayoutFrame
 			fractions: (0.8 @ 0.25 corner: 1 @ 1));
 		children: {
@@ -766,7 +765,7 @@ GMTEEditor >> createLayersSpecWithBuilder: aBuilder [
 
 {
 	#category : #building,
-	#'squeak_changestamp' : 'tw 7/11/2024 16:46'
+	#'squeak_changestamp' : 'Alex M 7/11/2024 18:04'
 }
 GMTEEditor >> createTileViewerSpecWithBuilder: aBuilder [
 	"creates the spec for the tile viewer"
@@ -789,7 +788,7 @@ GMTEEditor >> createTileViewerSpecWithBuilder: aBuilder [
 					fractions: (0 @ 0 corner: 1 @ 0.9))
 		 };
 
-		minimumExtent:150@150;
+		minimumExtent:150 @ 150;
 		yourself
 ]
 

diff --git a/source/GM-TE/GMTEEditorTileMap.class.st b/source/GM-TE/GMTEEditorTileMap.class.st
@@ -345,7 +345,7 @@ GMTEEditorTileMap >> updateTileSprite: aTile [
 
 {
 	#category : #updating,
-	#'squeak_changestamp' : 'JS 7/11/2024 14:01'
+	#'squeak_changestamp' : 'Alex M 7/11/2024 17:39'
 }
 GMTEEditorTileMap >> updateTiles: aCoordinateCollection inLayer: aLayer FromEvent: anEvent [
 	"Add currently selected tile (model) to editable matrix stack at mouse position"
@@ -368,16 +368,16 @@ GMTEEditorTileMap >> updateTiles: aCoordinateCollection inLayer: aLayer FromEven
 		ifTrue: [
 			aCoordinateCollection do: [:c |
 				| tilePos |
-				self savePreviousImageFromMatrixCoordinate: c inLayer: aLayer.
 				((self tileMatrixStack layer: aLayer) inBounds: c) ifTrue: [
 					tile := self tileMatrixStack layer: aLayer at: c y at: c x.
 					tile
 						ifNotNil: [ 
+							self savePreviousImageFromMatrixCoordinate: c inLayer: aLayer.
 							tilePos := tile position.
 							tile abandon.
 							self tileMatrixStack layer: aLayer at: c y at: c x put: nil.
-							self saveNewImageFromPosition: tilePos inLayer: aLayer].
+							self saveNewImageFromPosition: tilePos inLayer: aLayer.
+							self model savedSinceModified: false].
 					]
-				].
-			self model savedSinceModified: false]
+				]]
 ]