[squeak-dev] The Trunk: Morphic-mt.771.mcz

commits at source.squeak.org commits at source.squeak.org
Fri Mar 6 08:13:01 UTC 2015


Marcel Taeumel uploaded a new version of Morphic to project The Trunk:
http://source.squeak.org/trunk/Morphic-mt.771.mcz

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

Name: Morphic-mt.771
Author: mt
Time: 6 March 2015, 9:12:23.556 am
UUID: 1363b90c-d0cd-d942-8a15-e43d4e3f818e
Ancestors: Morphic-mt.770

Fall-back implementations for drawing rounded rectangles added to abstract Canvas class. Fixes problems with color-mapping canvases.

=============== Diff against Morphic-mt.770 ===============

Item was added:
+ ----- Method: Canvas>>fillRoundRect:radius:fillStyle: (in category 'drawing-rectangles') -----
+ fillRoundRect: aRectangle radius: radius fillStyle: fillStyle
+ 
+ 	self
+ 		fillRectangle: aRectangle
+ 		fillStyle: fillStyle.!

Item was added:
+ ----- Method: Canvas>>frameAndFillRoundRect:radius:fillStyle:borderWidth:borderColor: (in category 'drawing-rectangles') -----
+ frameAndFillRoundRect: aRectangle radius: cornerRadius fillStyle: fillStyle borderWidth: bw borderColor: bc
+ 
+ 	self
+ 		frameAndFillRectangle: aRectangle
+ 		fillColor: fillStyle asColor
+ 		borderWidth: bw
+ 		borderColor: bc.!

Item was added:
+ ----- Method: Canvas>>frameRoundRect:radius:width:color: (in category 'drawing-rectangles') -----
+ frameRoundRect: aRectangle radius: radius width: borderWidth color: borderColor
+ 
+ 	self
+ 		frameRectangle: aRectangle
+ 		width: borderWidth
+ 		color: borderColor.!

Item was changed:
+ ----- Method: FormCanvas>>balloonFillRectangle:fillStyle: (in category 'private') -----
- ----- Method: FormCanvas>>balloonFillRectangle:fillStyle: (in category 'drawing-rectangles') -----
  balloonFillRectangle: aRectangle fillStyle: aFillStyle
  
  	self asBalloonCanvas fillRectangle: aRectangle fillStyle: aFillStyle.!

Item was changed:
+ ----- Method: FormCanvas>>balloonFillRoundRect:radius:fillStyle: (in category 'private') -----
- ----- Method: FormCanvas>>balloonFillRoundRect:radius:fillStyle: (in category 'drawing-rectangles') -----
  balloonFillRoundRect: aRectangle radius: radius fillStyle: fillStyle
  	^self asBalloonCanvas fillRoundRect: aRectangle radius: radius fillStyle: fillStyle!

Item was changed:
+ ----- Method: FormCanvas>>infiniteFillRectangle:fillStyle: (in category 'private') -----
- ----- Method: FormCanvas>>infiniteFillRectangle:fillStyle: (in category 'drawing-rectangles') -----
  infiniteFillRectangle: aRectangle fillStyle: aFillStyle
  
  	| additionalOffset rInPortTerms clippedPort targetTopLeft clipOffset ex |
  
  	"this is a bit of a kludge to get the form to be aligned where I *think* it should be.
  	something better is needed, but not now"
  
  	additionalOffset := 0 at 0.
  	ex := aFillStyle form extent.
  	rInPortTerms := aRectangle translateBy: origin.
  	clippedPort := port clippedBy: rInPortTerms.
  	targetTopLeft := clippedPort clipRect topLeft truncateTo: ex.
  	clipOffset := rInPortTerms topLeft - targetTopLeft.
  	additionalOffset := (clipOffset \\ ex) - ex.
  	^aFillStyle
  		displayOnPort: clippedPort
  		offsetBy: additionalOffset
  !



More information about the Squeak-dev mailing list