Merge origin/tmm-dev into tmm-dev

Author: Aleksander Morgensterns

source/GM-TE/GMTEEditor.class.st

@@ -75,6 +75,15 @@ GMTEEditor class >> getVisibilityIndicator: aBoolean [
 		ifFalse: [^ ' (h)']
 ]
 
+{
+	#category : #'as yet unclassified',
+	#'squeak_changestamp' : 'tw 7/12/2024 18:33'
+}
+GMTEEditor class >> hLayoutFrame: intI ofN: intN [
+
+	^ self hLayoutFrame: intI ofN: intN vSymmetric: 0
+]
+
 {
 	#category : #'as yet unclassified',
 	#'squeak_changestamp' : 'tw 7/11/2024 17:03'
@@ -253,6 +262,35 @@ GMTEEditor class >> toolBarVSpace [
 	^ 0.1
 ]
 
+{
+	#category : #'as yet unclassified',
+	#'squeak_changestamp' : 'tw 7/12/2024 18:33'
+}
+GMTEEditor class >> vLayoutFrame: intI ofN: intN [
+
+	^ self vLayoutFrame: intI ofN: intN hSymmetric: 0
+]
+
+{
+	#category : #'as yet unclassified',
+	#'squeak_changestamp' : 'tw 7/12/2024 18:26'
+}
+GMTEEditor class >> vLayoutFrame: intI ofN: intN hLeft: aFloat right: anotherFloat [
+
+	"useful for building buttons, maybe move this to instance? TODO FLAG"
+	
+	^ LayoutFrame fractions: ((aFloat @ (intI - 1 / intN)) corner: (1 - anotherFloat @ (intI / intN)))
+]
+
+{
+	#category : #'as yet unclassified',
+	#'squeak_changestamp' : 'tw 7/12/2024 18:26'
+}
+GMTEEditor class >> vLayoutFrame: intI ofN: intN hSymmetric: aFloat [
+
+	^ self vLayoutFrame: intI ofN: intN hLeft: aFloat right: aFloat
+]
+
 {
 	#category : #'command processing',
 	#'squeak_changestamp' : 'Valentin Teutschbein 7/6/2024 11:56'
@@ -327,11 +365,11 @@ GMTEEditor >> associatedMorph [
 
 {
 	#category : #accessing,
-	#'squeak_changestamp' : 'TW 6/25/2024 15:55'
+	#'squeak_changestamp' : 'mcjj 7/12/2024 19:38'
 }
 GMTEEditor >> associatedMorph: anObject [
 
-	associatedMorph := anObject.
+	associatedMorph := anObject
 ]
 
 {
@@ -403,22 +441,22 @@ GMTEEditor >> brushButtons [
 
 {
 	#category : #accessing,
-	#'squeak_changestamp' : 'TW 7/9/2024 18:19'
+	#'squeak_changestamp' : 'mcjj 7/12/2024 19:38'
 }
 GMTEEditor >> brushButtons: anObject [
 
-	brushButtons := anObject.
+	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;
@@ -447,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;
@@ -574,30 +604,37 @@ GMTEEditor >> createAttributeSpecWithBuilder: aBuilder descriptor: aString gette
 
 {
 	#category : #building,
-	#'squeak_changestamp' : 'TW 7/9/2024 17:28'
+	#'squeak_changestamp' : 'tw 7/12/2024 18:57'
 }
 GMTEEditor >> createAttributeSpecWithBuilder: aBuilder descriptor: aString getter: aSelector setter: anotherSelector model: aModel frame: aFrame [ 
 	"a helper function to create attribute specs"
 
-	^ self withMorphOf: ((aBuilder pluggablePanelSpec new)
+	| minTextWidth minInputWidth |
+	minTextWidth := (TextStyle defaultFont approxWidthOfText: aString asText).
+	minInputWidth := (TextStyle defaultFont approxWidthOfText: '1234' asText).
+	
+	^ (aBuilder pluggablePanelSpec new)
+		name: 'attributeContainer';
 		frame: aFrame;
 		layout: #proportional;
+		minimumWidth: minTextWidth + minInputWidth;
 		children: {
 			(aBuilder pluggableStaticTextSpec new)
 			model: aModel;
-			frame: (LayoutFrame fractions: (0 @ 0 corner: (2 / 3) @ 1));
-			text: aString.
+			frame: (LayoutFrame fractions: (0 @ 0 corner: 2 / 3 @ 1));
+			text: aString;
+			minimumWidth: minTextWidth.
+			
 
 			(aBuilder pluggableInputFieldSpec new)
 			model: aModel;
 			indicateUnacceptedChanges: false;
-			frame: (LayoutFrame fractions: (((2 / 3) + 0.1) @ 0 corner: 1 @ 1));
-			minimumExtent: 45@30;
+			frame: (LayoutFrame fractions: (2 / 3 @ 0 corner: 1 @ 1));
 			getText: aSelector;
-			setText: anotherSelector
+			setText: anotherSelector;
+			minimumWidth: minInputWidth
 		};
-		yourself) do: [:morph |
-			morph layoutPolicy: TableLayout new]
+		yourself
 ]
 
 {
@@ -647,27 +684,23 @@ GMTEEditor >> createCommandBarSpecWithBuilder: aBuilder [
 
 {
 	#category : #building,
-	#'squeak_changestamp' : 'tw 7/11/2024 17:48'
+	#'squeak_changestamp' : 'tw 7/12/2024 19:01'
 }
 GMTEEditor >> createInspectorSpecWithBuilder: aBuilder [
 	"creates the spec for the inspector tab"
 
-	^ aBuilder pluggableScrollPaneSpec new
+	^ aBuilder pluggablePanelSpec new
 		frame: (LayoutFrame fractions: (0.8 @ 0 corner: 1 @ 0.25)
 		offsets: (0 @ 30 corner: 0 @ 30));
-		padding: (Rectangle left: 3 right: 0 top: 0 bottom: 0);
-		hScrollBarPolicy: #never;
-		layout: #vertical;
 		name: 'inspector';
 		children: {
-		self createAttributeSpecWithBuilder: aBuilder descriptor: 'Padding:' getter: #getPaddingAsString setter: #setPadding: model: self.
+		self createAttributeSpecWithBuilder: aBuilder descriptor: 'Padding:' getter: #getPaddingAsString setter: #setPadding: model: self frame: (GMTEEditor vLayoutFrame: 1 ofN: 3).
 
-		self createAttributeSpecWithBuilder: aBuilder descriptor: 'Grid Width:' getter: #getGridWidthAsString setter: #setGridWidth: model: self.
-
-		self createAttributeSpecWithBuilder: aBuilder descriptor: 'Grid Height:' getter: #getGridHeightAsString setter: #setGridHeight: model: self
+		self createAttributeSpecWithBuilder: aBuilder descriptor: 'Grid Width:' getter: #getGridWidthAsString setter: #setGridWidth: model: self frame: (GMTEEditor vLayoutFrame: 2 ofN: 3).
+		
+		self createAttributeSpecWithBuilder: aBuilder descriptor: 'Grid Height:' getter: #getGridHeightAsString setter: #setGridHeight: model: self frame: (GMTEEditor vLayoutFrame: 3 ofN: 3)
 		};
-		verticalResizing: #shrinkWrap;
-		horizontalResizing: #shrinkWrap;
+		minimumWidth: (self getMaximalLengthOfStrings: (OrderedCollection newFrom: {'Padding:' . 'Grid Width:' . 'Grid Height:'}));
 		yourself
 ]
 
@@ -1071,11 +1104,12 @@ GMTEEditor >> exportMenu [
 
 {
 	#category : #'input handling',
-	#'squeak_changestamp' : 'mcjj 7/12/2024 17:12'
+	#'squeak_changestamp' : 'mcjj 7/12/2024 19:34'
 }
 GMTEEditor >> filterEvent: aKeyboardEvent for: anObject [
-	| key |
+	"handles keyboard shortcuts"
 
+	| key |
 	aKeyboardEvent isKeystroke
 		ifFalse: [^ aKeyboardEvent].
 
@@ -1088,7 +1122,6 @@ GMTEEditor >> filterEvent: aKeyboardEvent for: anObject [
 			[$o] -> [self importFromTileset].
 			[$g] -> [self toggleGrid].
 			[$h] -> [self toggleBackgroundTiles].
-			[$r] -> [self rotateSelectedTile].
 
 			[$a] -> [self addLayer].
 			[$n] -> [self renameLayer].
@@ -1099,6 +1132,7 @@ GMTEEditor >> filterEvent: aKeyboardEvent for: anObject [
 
 			[$z] -> [self undo].
 			[$y] -> [self redo].
+			[$r] -> [self rotateSelectedTile].
 			[$1] -> [self selectRadiusBrush].
 			[$2] -> [self selectLineBrush].
 			[$3] -> [self selectFillBrush].
@@ -1195,6 +1229,15 @@ GMTEEditor >> getLayerList [
 	^ self tileMap tileMatrixStack collectLayers: [:aLayer | aLayer displayName, (GMTEEditor getVisibilityIndicator: aLayer visible)]
 ]
 
+{
+	#category : #helper,
+	#'squeak_changestamp' : 'tw 7/12/2024 19:01'
+}
+GMTEEditor >> getMaximalLengthOfStrings: anOrderedCollection [
+
+	^ (anOrderedCollection collect: [:aString | TextStyle defaultFont approxWidthOfText: aString asText]) max
+]
+
 {
 	#category : #accessing,
 	#'squeak_changestamp' : 'jj 6/22/2024 20:54'
@@ -1669,6 +1712,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'
@@ -1929,7 +1990,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"
@@ -1940,7 +2001,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]

source/GM-TE/GMTEEditorTileMap.class.st

@@ -55,7 +55,7 @@ GMTEEditorTileMap >> currentTileChanges: aTileDictionary [
 
 {
 	#category : #updating,
-	#'squeak_changestamp' : 'Alex M 7/12/2024 17:16'
+	#'squeak_changestamp' : 'Valentin Teutschbein 7/12/2024 18:28'
 }
 GMTEEditorTileMap >> deleteTiles: anIndexSet inLayer: aLayer [
 	"delete tiles from editable matrix stack at given indices"
@@ -220,13 +220,13 @@ GMTEEditorTileMap >> mouseUp: anEvent [
 
 {
 	#category : #updating,
-	#'squeak_changestamp' : 'Alex M 7/12/2024 17:15'
+	#'squeak_changestamp' : 'Valentin Teutschbein 7/12/2024 18:27'
 }
-GMTEEditorTileMap >> placeTiles: aCoordinateCollection inLayer: aLayer [
+GMTEEditorTileMap >> placeTiles: anIndexSet inLayer: aLayer [
 	"add currently selected tile (model) to editable matrix stack at given indices"
-	
+
 	| tile |
-	aCoordinateCollection do: [:c |
+	anIndexSet do: [:c |
 		self savePreviousImageFromIndex: c inLayer: aLayer.
 		((self tileMatrixStack layer: aLayer) inBounds: c) ifTrue: [
 				tile := self tileMatrixStack layer: aLayer at: c y at: c x.

source/GM-TE/GMTEImageButton.class.st

@@ -364,11 +364,16 @@ GMTEImageButton >> target: anObject [
 
 {
 	#category : #'visual properties',
-	#'squeak_changestamp' : 'TW 7/9/2024 19:11'
+	#'squeak_changestamp' : 'tw 7/12/2024 18:39'
 }
 GMTEImageButton >> updateVisualState: anEvent [
 
 
+	self enabled 
+		ifFalse: [
+			self setImageMode: 'disabled'.
+			^ nil].
+		
 	self buttonGroup
 		ifNil: [
 			(self containsPoint: Sensor cursorPoint)

source/GM-TE/GMTETileMap.class.st

@@ -296,6 +296,23 @@ GMTETileMap >> correctedTilePositionMap: aPoint [
 	^ self correctedTilePosition: aPoint startingOffset: self tileCornerOffsetMap
 ]
 
+{
+	#category : #updating,
+	#'squeak_changestamp' : 'Valentin Teutschbein 7/12/2024 18:32'
+}
+GMTETileMap >> deleteTiles: anIndexSet inLayer: aLayer [
+	"delete tiles from editable matrix stack at given indices"
+	
+	| tile |
+	anIndexSet do: [:c |
+		((self tileMatrixStack layer: aLayer) inBounds: c) ifTrue: [
+			tile := self tileMatrixStack layer: aLayer at: c y at: c x.
+			tile	ifNotNil: [ 
+				tile abandon.
+				self tileMatrixStack layer: aLayer at: c y at: c x put: nil.
+				self saveNewImageFromIndex: c inLayer: aLayer]]]
+]
+
 {
 	#category : #checking,
 	#'squeak_changestamp' : 'Ivo Zilkenat 6/24/2024 11:08'
@@ -811,6 +828,31 @@ GMTETileMap >> moveViewBy: aPoint [
 	self updateMap
 ]
 
+{
+	#category : #updating,
+	#'squeak_changestamp' : 'Valentin Teutschbein 7/12/2024 19:22'
+}
+GMTETileMap >> placeTiles: anIndexSet inLayer: aLayer ofClass: aTileClass withImage: anImage [
+
+	| tile |
+	self assert: (aTileClass inheritsFrom: GMTETile) description: 'Expected GMTETile or subclass'.
+
+	anIndexSet do: [:c |
+		((self tileMatrixStack layer: aLayer) inBounds: c) ifTrue: [
+				tile := self tileMatrixStack layer: aLayer at: c y at: c x.
+				tile ifNil: [tile := self generateTileAtlayer: aLayer x: c x y: c y stack: tileMatrixStack tileType: aTileClass].
+				tile updateSprite: anImage]]
+]
+
+{
+	#category : #updating,
+	#'squeak_changestamp' : 'Valentin Teutschbein 7/12/2024 18:58'
+}
+GMTETileMap >> placeTiles: anIndexSet inLayer: aLayer withImage: anImage [
+
+	self placeTiles: anIndexSet inLayer: aLayer ofClass: GMTETile withImage: anImage
+]
+
 {
 	#category : #updating,
 	#'squeak_changestamp' : 'Ivo Zilkenat 6/24/2024 11:27'