The Trunk: Morphic-mt.944.mcz

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

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

Name: Morphic-mt.944
Author: mt
Time: 28 April 2015, 8:01:55.694 am
UUID: d8d3d098-6144-6847-b45d-f0635dee2269
Ancestors: Morphic-mt.943

Small cosmetic fix for visual wrap border. Respects margins of textMorph now. Colors a little bit more friendly.

=============== Diff against Morphic-mt.943 ===============

Item was changed:
  ----- Method: PluggableTextMorph>>drawOverlayOn: (in category 'drawing') -----
  drawOverlayOn: aCanvas
  "Draw frame adornments on top of everything otherwise they will partially overlap with text selection which looks ugly."
 
- super drawOverlayOn: aCanvas.
  self drawWrapBorderOn: aCanvas.
+ super drawOverlayOn: aCanvas.
  self drawFrameAdornmentsOn: aCanvas.
  !

Item was changed:
  ----- Method: PluggableTextMorph>>drawWrapBorderOn: (in category 'drawing') -----
  drawWrapBorderOn: aCanvas
 
  | 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 := (textMorph textStyle defaultFont widthOf: $x) * self class visualWrapBorderLimit.
  offset > self width ifTrue: [^ self].
 
  rect := scroller topLeft + (offset @ 0) corner: scroller bottomRight.
 
  aCanvas
  fillRectangle: rect
  color: (self borderStyle color muchLighter alpha: 0.3).
  aCanvas
  line: rect topLeft
  to: rect bottomLeft
  width: self borderStyle width
+ color: (self borderStyle color alpha: 0.5).!
- color: self borderStyle color.!