added deletion command (only for deleting the top layer so far)

Author: Aleksander Morgensterns

source/GM-TE/GMTEAddLayerCommand.class.st

@@ -20,15 +20,11 @@ GMTEAddLayerCommand class >> withEditor: anEditor [
 
 {
 	#category : #execution,
-	#'squeak_changestamp' : 'Alex M 7/4/2024 01:43'
+	#'squeak_changestamp' : 'Alex M 7/6/2024 23:13'
 }
 GMTEAddLayerCommand >> do [
-	"TODO: refactor this nicely by using inbuilt editor function while avoiding recursion"
-	
-	self editor tileMap tileMatrixStack pushLayer.
-	self editor
-		selectOnlyLayer: self editor layerCount;
-		changed: #getLayerList
+
+	self editor addTilemapLayer
 ]
 
 {
@@ -49,11 +45,9 @@ GMTEAddLayerCommand >> editor: anObject [
 
 {
 	#category : #execution,
-	#'squeak_changestamp' : 'Alex M 7/4/2024 01:40'
+	#'squeak_changestamp' : 'Alex M 7/7/2024 00:53'
 }
 GMTEAddLayerCommand >> undo [
 
-	self editor
-		selectLayer: self editor layerCount;
-		deleteSelectedLayers
+	self editor deleteTilemapLayers: {self editor getLayerList size}
 ]

source/GM-TE/GMTEDeleteLayerCommand.class.st

@@ -1,5 +1,56 @@
 Class {
 	#name : #GMTEDeleteLayerCommand,
 	#superclass : #GMTETilemapSizeCommand,
+	#instVars : [
+		'layers'
+	],
 	#category : #'GM-TE-UI'
 }
+
+{
+	#category : #'as yet unclassified',
+	#'squeak_changestamp' : 'Alex M 7/6/2024 23:20'
+}
+GMTEDeleteLayerCommand class >> fromLayers: aLayerList editor: anEditor [
+
+	^ (self new)
+		layers: aLayerList;
+		editor: anEditor;
+		yourself
+]
+
+{
+	#category : #execution,
+	#'squeak_changestamp' : 'Alex M 7/6/2024 23:18'
+}
+GMTEDeleteLayerCommand >> do [
+
+	self editor deleteTilemapLayers: self layers
+	
+]
+
+{
+	#category : #accessing,
+	#'squeak_changestamp' : 'Alex M 7/6/2024 23:19'
+}
+GMTEDeleteLayerCommand >> layers [
+	^ layers
+]
+
+{
+	#category : #accessing,
+	#'squeak_changestamp' : 'Alex M 7/6/2024 23:19'
+}
+GMTEDeleteLayerCommand >> layers: anObject [
+	layers := anObject
+]
+
+{
+	#category : #execution,
+	#'squeak_changestamp' : 'Alex M 7/6/2024 23:31'
+}
+GMTEDeleteLayerCommand >> undo [
+	self flag: 'NEEDS TO BE EXPENDED TO MULTIPLE LAYERS'.
+	
+	self editor addTilemapLayer
+]

source/GM-TE/GMTEEditor.class.st

@@ -185,17 +185,26 @@ GMTEEditor >> addCommand: aCommand [
 
 {
 	#category : #'layer button functions',
-	#'squeak_changestamp' : 'Alex M 7/4/2024 01:37'
+	#'squeak_changestamp' : 'Alex M 7/7/2024 00:51'
 }
 GMTEEditor >> addLayer [
 	"adds a new tileMap layer"
-	
-	| newLayerNumber |
 	(self layerCount >= GMTETileMap maxLayers) ifTrue: [^ nil].
-	newLayerNumber :=  self layerCount + 1.
+	self
+		addCommand: (GMTEAddLayerCommand withEditor: self);
+		addTilemapLayer
+]
 
-	self addCommand: (GMTEAddLayerCommand withEditor: self).
+{
+	#category : #'layer manipulation',
+	#'squeak_changestamp' : 'Alex M 7/6/2024 23:12'
+}
+GMTEEditor >> addTilemapLayer [
 
+	| newLayerNumber |
+	(self layerCount >= GMTETileMap maxLayers) ifTrue: [^ nil].
+	newLayerNumber :=  self layerCount + 1.
+	
 	self tileMap tileMatrixStack pushLayer.
 	self 
 		selectOnlyLayer: newLayerNumber;
@@ -731,14 +740,24 @@ GMTEEditor >> currentCommand: anObject [
 
 {
 	#category : #'layer button functions',
-	#'squeak_changestamp' : 'Ivo Zilkenat 6/24/2024 10:45'
+	#'squeak_changestamp' : 'Alex M 7/7/2024 00:53'
 }
 GMTEEditor >> deleteSelectedLayers [
 	"deletes all selected layers unless this would delete all layers"
-	
 	(self anyLayerSelected not or: (self selectedLayers size >= self getLayerList size)) ifTrue: [^ nil].
 
-	self tileMap tileMatrixStack removeLayersAt: self selectedLayers.
+	self
+		addCommand: (GMTEDeleteLayerCommand fromLayers: self selectedLayers editor: self);
+		deleteTilemapLayers: self selectedLayers
+]
+
+{
+	#category : #'layer manipulation',
+	#'squeak_changestamp' : 'Alex M 7/7/2024 00:51'
+}
+GMTEEditor >> deleteTilemapLayers: aLayerList [
+	
+	self tileMap tileMatrixStack removeLayersAt: aLayerList.
 	self 
 		deselectAllLayers;
 		changed: #getLayerList;
@@ -1848,15 +1867,15 @@ GMTEEditor >> trayViewer: anObject [
 
 {
 	#category : #'command processing',
-	#'squeak_changestamp' : 'TW 7/2/2024 18:32'
+	#'squeak_changestamp' : 'Alex M 7/6/2024 23:35'
 }
 GMTEEditor >> undo [
 
-	"A bit hacky, maybe fix later"
+	self flag: 'DO THIS USING TILEMAP FUNCTIONS'.
 	(self currentCommand > 1) 
 		ifTrue: [(self commands at: self currentCommand) undo.
 			self currentCommand: self currentCommand - 1.
-			((self commands at: self currentCommand + 1) class = GMTETilemapSizeCommand)
+			({GMTETilemapSizeCommand. GMTEDeleteLayerCommand} includes: (self commands at: self currentCommand + 1) class)
 				ifTrue: [self redoAllCommandsUntil: self currentCommand].
 			self savedSinceModified: false]
 ]