[squeak-dev] The Trunk: Graphics-mt.485.mcz

commits at source.squeak.org commits at source.squeak.org
Mon Feb 21 15:01:07 UTC 2022

Marcel Taeumel uploaded a new version of Graphics to project The Trunk:

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

Name: Graphics-mt.485
Author: mt
Time: 21 February 2022, 4:00:59.626099 pm
UUID: 7540de82-ce66-1146-996d-30a8f4112016
Ancestors: Graphics-mt.484

Activate top/bottom margins during text composition step 2 of 2: User margins during composition to move text lines up or down.

=============== Diff against Graphics-mt.484 ===============

Item was changed:
  ----- Method: TextComposer>>composeEachRectangleIn: (in category 'private') -----
  composeEachRectangleIn: rectangles
  	| myLine lastChar |
  	1 to: rectangles size do: [:i | 
  		currCharIndex <= theText size ifFalse: [^false].
  		myLine := scanner 
  			composeFrom: currCharIndex 
  			inRectangle: (rectangles at: i)				
  			firstLine: isFirstLine 
  			leftSide: i=1 
  			rightSide: i=rectangles size.
  		lines addLast: myLine.
+ 		myLine moveByTopMargin.
+ 		actualHeight := actualHeight max: myLine lineHeightWithMargins.  "includes font changes and text style's #lineSpacing"
- 		actualHeight := actualHeight max: myLine lineHeight.  "includes font changes"
  		currCharIndex := myLine last + 1.
  		lastChar := theText at: myLine last.
  		(CharacterSet crlf includes: lastChar) ifTrue: [^#cr].
  		wantsColumnBreaks ifTrue: [
  			lastChar = Character characterForColumnBreak ifTrue: [^#columnBreak].

More information about the Squeak-dev mailing list