[etoys-dev] Etoys: Morphic-kfr.19.mcz

[commits at source.squeak.org]

Karl Ramberg uploaded a new version of Morphic to project Etoys:
http://source.squeak.org/etoys/Morphic-kfr.19.mcz

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

Name: Morphic-kfr.19
Author: kfr
Time: 15 June 2010, 1:04:18 pm
UUID: 515a8e38-5bd6-594c-a109-1fdf1b24a6ff
Ancestors: Morphic-kfr.18

When a Holders indicate cursor is true and it's resize to fit is false the cursor will indicate stuff in the Holder outside the bounds of the Holder. 




=============== Diff against Morphic-kfr.18 ===============

Item was changed:
  ----- Method: PasteUpMorph>>drawOn: (in category 'drawing') -----
  drawOn: aCanvas 
  	"Draw in order:
  	- background color
  	- grid, if any
  	- background sketch, if any
  	- Update and draw the turtleTrails form. See the comment in updateTrailsForm.
  	- cursor box if any
  
  	Later (in drawSubmorphsOn:) I will skip drawing the background sketch."
  
  	"draw background fill"
  	super drawOn: aCanvas.
  
  	"draw grid"
  	(self griddingOn and: [self gridVisible]) 
  		ifTrue: 
  			[aCanvas fillRectangle: self bounds
  				fillStyle: (self 
  						gridFormOrigin: self gridOrigin
  						grid: self gridModulus
  						background: nil
  						line: Color lightGray)].
  
  	"draw background sketch."
  	backgroundMorph ifNotNil: [
  		self clipSubmorphs ifTrue: [
  			aCanvas clipBy: self clippingBounds
  				during: [ :canvas | canvas fullDrawMorph: backgroundMorph ]]
  			ifFalse: [ aCanvas fullDrawMorph: backgroundMorph ]].
  
  	"draw turtle trails"
  	self updateTrailsForm.
  	turtleTrailsForm 
  		ifNotNil: [aCanvas paintImage: turtleTrailsForm at: self position].
  
  	"draw cursor"
  	(submorphs notEmpty and: [self indicateCursor]) 
  		ifTrue: 
+ 			[self clipSubmorphs
+ 				ifTrue:
+ 					[aCanvas clipBy: self clippingBounds
+ 						during: [ :canvas | canvas 
+ 		
- 			[aCanvas 
  				frameRectangle: self selectedRect
+ 		
  				width: 2
+ 		
+ 				color: Color black]]	
+ 				ifFalse:
+ 					[aCanvas frameRectangle: self selectedRect width: 2 color: Color black]]!
- 				color: Color black]!