[Pkg] The Trunk: Morphic-cmm.608.mcz

[commits at source.squeak.org]

Chris Muller uploaded a new version of Morphic to project The Trunk:
http://source.squeak.org/trunk/Morphic-cmm.608.mcz

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

Name: Morphic-cmm.608
Author: cmm
Time: 25 January 2012, 12:54:11.274 pm
UUID: 76babbf7-17f2-412c-a684-d7f5248bd4c3
Ancestors: Morphic-cao.591, Morphic-dtl.607

Merge fix for MulticolumnLazyListMorph from Christopher Oliver.

=============== Diff against Morphic-dtl.607 ===============

Item was changed:
  ----- Method: LazyListMorph>>display:atRow:on: (in category 'drawing') -----
  display: item  atRow: row on: canvas
  	"display the given item at row row"
+ 	| drawBounds itemAsText |
+ 	itemAsText := item asStringOrText.
- 	| drawBounds |
  	drawBounds := self drawBoundsForRow: row.
  	drawBounds := drawBounds intersect: self bounds.
+ 	itemAsText isText
+ 		ifTrue: [ canvas drawString: itemAsText in: drawBounds
+ 			font: (font emphasized: (itemAsText emphasisAt: 1))
+ 			color: (self colorForRow: row) ]
+ 		ifFalse: [ canvas drawString: itemAsText in: drawBounds
+ 			font: font color: (self colorForRow: row) ].!
- 	item isText
- 		ifTrue: [ canvas drawString: item in: drawBounds font: (font emphasized: (item emphasisAt: 1)) color: (self colorForRow: row) ]
- 		ifFalse: [ canvas drawString: item in: drawBounds font: font color: (self colorForRow: row) ].!

Item was changed:
  ----- Method: LazyListMorph>>drawOn: (in category 'drawing') -----
  drawOn: aCanvas
  	| |
  	listItems size = 0 ifTrue: [ ^self ].
   
  	self drawSelectionOn: aCanvas.
  
  	(self topVisibleRowForCanvas: aCanvas) to: (self bottomVisibleRowForCanvas: aCanvas) do: [ :row |
  		(listSource itemSelectedAmongMultiple:  row) ifTrue: [
  			self drawBackgroundForMulti: row on: aCanvas. ].
+ 		self display: (self item: row) atRow: row on: aCanvas.
- 		self display: (self item: row) asStringOrText atRow: row on: aCanvas.
  	].
  
  	listSource potentialDropRow > 0 ifTrue: [
  		self highlightPotentialDropRow: listSource potentialDropRow on: aCanvas ].!