The Trunk: Morphic-ar.359.mcz

Andreas Raab uploaded a new version of Morphic to project The Trunk:
http://source.squeak.org/trunk/Morphic-ar.359.mcz

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

Name: Morphic-ar.359
Author: ar
Time: 26 February 2010, 5:09:48.315 pm
UUID: 94b96cd7-3d04-0e47-af32-61f82601e6b6
Ancestors: Morphic-ar.358

Slight tweak to text adornments. Draw them on top of the text and selection to avoid ugly bleeding of translucent selection color.

=============== Diff against Morphic-ar.358 ===============

Item was added:
+ ----- Method: PluggableTextMorph>>drawFrameAdornmentsOn: (in category 'drawing') -----
+ drawFrameAdornmentsOn: aCanvas
+ "Include a thin red inset border for unaccepted edits, or, if the unaccepted edits are known to conflict with a change made somewhere else to the same method (typically), put a thick red frame"
+
+ self wantsFrameAdornments ifTrue:
+ [(model notNil and: [model refusesToAcceptCode])
+ ifTrue:  "Put up feedback showing that code cannot be submitted in this state"
+ [self drawFrameAdornment: Color tan on: aCanvas]
+ ifFalse:
+ [self hasEditingConflicts
+ ifTrue:
+ [self drawFrameAdornment: Color red on: aCanvas]
+ ifFalse:
+ [self hasUnacceptedEdits
+ ifTrue:
+ [model wantsDiffFeedback
+ ifTrue:
+ [self drawFrameAdornment: Color yellow on: aCanvas]
+ ifFalse:
+ [self drawFrameAdornment: Color orange on: aCanvas]]
+ ifFalse:
+ [model wantsDiffFeedback
+ ifTrue:
+ [self drawFrameAdornment: Color green on: aCanvas]]]]]!

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

Item was removed:
- ----- Method: PluggableTextMorph>>drawOn: (in category 'drawing') -----
- drawOn: aCanvas
- "Include a thin red inset border for unaccepted edits, or, if the unaccepted edits are known to conflict with a change made somewhere else to the same method (typically), put a thick red frame"
-
- super drawOn: aCanvas.
- self wantsFrameAdornments ifTrue:
- [(model notNil and: [model refusesToAcceptCode])
- ifTrue:  "Put up feedback showing that code cannot be submitted in this state"
- [self drawFrameAdornment: Color tan on: aCanvas]
- ifFalse:
- [self hasEditingConflicts
- ifTrue:
- [self drawFrameAdornment: Color red on: aCanvas]
- ifFalse:
- [self hasUnacceptedEdits
- ifTrue:
- [model wantsDiffFeedback
- ifTrue:
- [self drawFrameAdornment: Color yellow on: aCanvas]
- ifFalse:
- [self drawFrameAdornment: Color orange on: aCanvas]]
- ifFalse:
- [model wantsDiffFeedback
- ifTrue:
- [self drawFrameAdornment: Color green on: aCanvas]]]]]!