[squeak-dev] The Trunk: EToys-nice.384.mcz

commits at source.squeak.org commits at source.squeak.org
Wed Mar 4 23:46:04 UTC 2020

Nicolas Cellier uploaded a new version of EToys to project The Trunk:

==================== Summary ====================

Name: EToys-nice.384
Author: nice
Time: 5 March 2020, 12:45:59.080204 am
UUID: 40d0d063-daeb-4b6e-8d94-d2415ce3128a
Ancestors: EToys-mt.383, EToys-ct.377

Merge EToys-ct.377

Remove missspelled extension selector from FilePath. The thing is named #converter: and already located in Files with exactly the same implementation.

Cherry pick SameGame changes from:

Fix longstanding visual bug in SameGame. Cascade had wrong order so deselection could not work.

SameGameTile borderColor must be updated as well as main tile color.

=============== Diff against EToys-mt.383 ===============

Item was removed:
- ----- Method: FilePath>>coverter: (in category '*Etoys-Squeakland-conversion') -----
- coverter: aTextConverter
- 	converter class ~= aTextConverter class ifTrue: [
- 		converter := aTextConverter.
- 		vmPathName := squeakPathName convertToWithConverter: converter
- 	].
- !

Item was changed:
  ----- Method: SameGameBoard>>removeSelection (in category 'actions') -----
  		ifNil: [^ self].
  		rememberUndoableAction: [selection
+ 				do: [:loc | (self tileAt: loc) setSwitchState: false; disabled: true].
- 				do: [:loc | (self tileAt: loc) disabled: true;
- 						 setSwitchState: false].
  			self collapseColumns: (selection
  					collect: [:loc | loc x] as: Set) sorted.
  			selection := nil.
  			flash := false.
  			(target notNil
  					and: [actionSelector notNil])
  				ifTrue: [target perform: actionSelector withArguments: arguments]]
  		named: 'remove selection' translated!

Item was changed:
  ----- Method: SameGameTile>>color: (in category 'accessing') -----
  color: aColor 
  	super color: aColor.
+ 	self borderColor: aColor.
  	onColor := aColor.
  	offColor := aColor.
  	self changed!

More information about the Squeak-dev mailing list