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

commits at source.squeak.org commits at source.squeak.org
Mon Mar 14 14:57:57 UTC 2022


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

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

Name: Morphic-mt.1934
Author: mt
Time: 14 March 2022, 3:57:50.480786 pm
UUID: 5d6da225-6c5a-504e-8b08-4685d8fc5547
Ancestors: Morphic-mt.1933

Revert an accidental commit of a specific method. Sorry for the noise.

=============== Diff against Morphic-mt.1933 ===============

Item was changed:
  ----- Method: PluggableTextMorph>>drawWrapBorderOn: (in category 'drawing') -----
  drawWrapBorderOn: aCanvas
  
+ 	| offset rect |
- 	| box offset rect |
  	self wantsWrapBorder ifFalse: [^ self].
  	textMorph ifNil: [^ self].
  	
+ 	offset := textMorph margins isRectangle
+ 		ifTrue: [textMorph margins left]
+ 		ifFalse: [textMorph margins isPoint
+ 			ifTrue: [textMorph margins x]
+ 			ifFalse: [textMorph margins]].
+ 	offset := offset + ((textMorph textStyle defaultFont widthOf: $x) * self class visualWrapBorderLimit).
+ 	offset > self width ifTrue: [^ self].
- 	box := textMorph innerBounds.
- 	textMorph margins ifNotNil: [:m | box := box insetBy: m].
  	
- 	offset := box left + (textMorph textStyle compositionWidthFor: self class
- visualWrapBorderLimit).
- 	self numCharactersPerLine ifNotNil: [
- 		"Respect right margins only if we wrap at that border to not draw over glyphs."
- 		offset := offset + (textMorph innerBounds right - box right) + self borderWidth].
- 	offset > scroller width ifTrue: [^ self].
- 	
  	rect := scroller topLeft + (offset @ 0) corner: scroller bottomRight.
  
  	aCanvas
  		fillRectangle: rect
  		color: self wrapBorderColor.
  	aCanvas
  		line: rect topLeft
  		to: rect bottomLeft
+ 		width: self borderStyle width
- 		width: self borderWidth
  		color: (self wrapBorderColor muchDarker alpha: 0.5).!



More information about the Squeak-dev mailing list