[squeak-dev] The Trunk: ST80-mt.276.mcz

commits at source.squeak.org commits at source.squeak.org
Thu Feb 10 15:50:01 UTC 2022


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

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

Name: ST80-mt.276
Author: mt
Time: 10 February 2022, 4:49:59.714843 pm
UUID: 1ebb1c93-8301-c740-be8f-a156e24c12fe
Ancestors: ST80-mt.275

Complements Graphics-mt.478

=============== Diff against ST80-mt.275 ===============

Item was changed:
  ----- Method: CompositionScanner>>composeLine:fromCharacterIndex:inParagraph: (in category '*ST80-Support') -----
  composeLine: lineIndex fromCharacterIndex: startIndex inParagraph: aParagraph 
  	"Answer an instance of TextLineInterval that represents the next line in the paragraph."
  	| runLength stopCondition |
  	destX := spaceX := leftMargin := aParagraph leftMarginForCompositionForLine: lineIndex.
  	destY := 0.
  	rightMargin := aParagraph rightMarginForComposition.
  	leftMargin >= rightMargin ifTrue: [self error: 'No room between margins to compose'].
  	lastIndex := startIndex.	"scanning sets last index"
+ 	lineHeight := baseline := lineGap := lineGapSlice := 0.  "Will be increased by setFont"
- 	lineHeight := textStyle lineGrid.  "may be increased by setFont:..."
- 	baseline := textStyle baseline.
  	self setStopConditions.	"also sets font"
  	self handleIndentation.
  	runLength := text runLengthFor: startIndex.
  	runStopIndex := (lastIndex := startIndex) + (runLength - 1).
  	line := TextLineInterval
  		start: lastIndex
  		stop: 0
  		internalSpaces: 0
  		paddingWidth: 0.
  	nextIndexAfterLineBreak := spaceCount := 0.
  	lastBreakIsNotASpace := false.
  	
  	[stopCondition := self scanCharactersFrom: lastIndex to: runStopIndex
  		in: text string rightX: rightMargin.
  	"See setStopConditions for stopping conditions for composing."
  	self perform: stopCondition] whileFalse.
  
  	^line
+ 		lineHeight: lineHeight + lineGap
+ 		baseline: baseline + lineGapSlice!
- 		lineHeight: lineHeight + textStyle leading
- 		baseline: baseline + textStyle leadingSlice!



More information about the Squeak-dev mailing list