The Trunk: Morphic-mt.1572.mcz

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

The Trunk: Morphic-mt.1572.mcz

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

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

Name: Morphic-mt.1572
Author: mt
Time: 15 October 2019, 9:31:59.358598 am
UUID: f5d0878b-7619-d44b-bfc7-43eaa8fa4436
Ancestors: Morphic-mt.1571

Fixes two minor issues after the recent LazyListMorph updates which affect the #cellInset property.

=============== Diff against Morphic-mt.1571 ===============

Item was changed:
  ----- Method: LazyListMorph>>displayFilterOn:for:in:font: (in category 'drawing') -----
  displayFilterOn: canvas for: row in: drawBounds font: font
  "Draw filter matches if any."
 
+ | fill height |
- | fill |
  listSource filterableList ifFalse: [^ self].
 
+ height := font height.
  fill := self filterColor isColor
  ifTrue: [SolidFillStyle color: self filterColor]
  ifFalse: [self filterColor].
  fill isGradientFill ifTrue: [
  fill origin: drawBounds topLeft.
+ fill direction: 0@ font height].
- fill direction: 0@ drawBounds height].
 
  (self filterOffsets: row) do: [:offset | | r |
+ r := ((drawBounds left + offset first first) @ drawBounds top corner: (drawBounds left + offset first last) @ (drawBounds top + height)).
- r := ((drawBounds left + offset first first) @ drawBounds top corner: (drawBounds left + offset first last) @ drawBounds bottom).
  canvas
  frameAndFillRoundRect: (r outsetBy: 1@0)
  radius: 3
  fillStyle: fill
  borderWidth: 1
  borderColor: fill asColor twiceDarker.
  canvas
  drawString: offset second
  in: r
  font: font
  color: self filterTextColor].!

Item was changed:
  ----- Method: LazyListMorph>>maxHeight (in category 'layout') -----
  maxHeight
 
+ ^ (self getListSize max: 1) * self rowHeight!
- ^ (self getListSize max: 1) * (font height + self cellInset top + self cellInset bottom)!