The Trunk: Morphic-eem.657.mcz

Eliot Miranda uploaded a new version of Morphic to project The Trunk:
http://source.squeak.org/trunk/Morphic-eem.657.mcz

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

Name: Morphic-eem.657
Author: eem
Time: 12 June 2013, 3:48:51.72 pm
UUID: 5a85e00c-94f9-4693-979d-811ad44a165f
Ancestors: Morphic-fbs.656

Fix a regression in SystemWindow>>addMorph:fullFrame:
that can trash ImageMorphs.
Recategorize and clean-up ImageMorph>>wantsRecolorHandle.

=============== Diff against Morphic-fbs.656 ===============

Item was added:
+ ----- Method: ImageMorph>>isImageMorph (in category 'testing') -----
+ isImageMorph
+ ^true!

Item was changed:
+ ----- Method: ImageMorph>>wantsRecolorHandle (in category 'accessing') -----
- ----- Method: ImageMorph>>wantsRecolorHandle (in category 'as yet unclassified') -----
  wantsRecolorHandle
+ ^ image notNil and: [image depth = 1]!
- ^ image isNil not
- and: [image depth = 1]!

Item was added:
+ ----- Method: Morph>>isImageMorph (in category 'testing') -----
+ isImageMorph
+ ^false!

Item was changed:
  ----- Method: SystemWindow>>addMorph:fullFrame: (in category 'panes') -----
  addMorph: aMorph fullFrame: aLayoutFrame
 
  | left right bottom top windowBorderWidth |
  windowBorderWidth := self class borderWidth.
 
  left := aLayoutFrame leftOffset ifNil: [0].
  right := aLayoutFrame rightOffset ifNil: [0].
 
  bottom := aLayoutFrame bottomOffset ifNil: [0].
  top := aLayoutFrame topOffset ifNil: [0].
 
  aLayoutFrame rightFraction = 1 ifTrue: [aLayoutFrame rightOffset: right - windowBorderWidth].
  aLayoutFrame leftFraction = 0
  ifTrue: [aLayoutFrame leftOffset: left + windowBorderWidth]
  ifFalse: [aLayoutFrame leftOffset: left + ProportionalSplitterMorph splitterWidth].
 
  aLayoutFrame bottomFraction = 1 ifTrue: [aLayoutFrame bottomOffset: bottom - windowBorderWidth].
  aLayoutFrame topFraction = 0
  ifTrue: [aLayoutFrame topOffset: top + windowBorderWidth]
  ifFalse: [aLayoutFrame topOffset: top + ProportionalSplitterMorph splitterWidth].
 
  (aMorph class name = #BrowserCommentTextMorph) ifTrue:
  [aLayoutFrame rightOffset: windowBorderWidth negated.
  aLayoutFrame leftOffset: windowBorderWidth.
  aLayoutFrame bottomOffset: windowBorderWidth negated.
  aLayoutFrame topOffset: (windowBorderWidth negated) + 4].
 
  super addMorph: aMorph fullFrame: aLayoutFrame.
 
  paneMorphs := paneMorphs copyReplaceFrom: 1 to: 0 with: (Array with: aMorph).
+ aMorph isImageMorph ifFalse:
+ [aMorph adoptPaneColor: self paneColor.
+ aMorph borderWidth: 1; borderColor: Color lightGray; color: Color white].
+ Preferences scrollBarsOnRight ifTrue:"reorder panes so flop-out right-side scrollbar is visible"
+ [self addMorphBack: aMorph].
- aMorph adoptPaneColor: self paneColor.
- aMorph borderWidth: 1; borderColor: Color lightGray; color: Color white.
- Preferences scrollBarsOnRight "reorder panes so flop-out right-side scrollbar is visible"
- ifTrue: [self addMorphBack: aMorph].
 
  self addPaneSplitters!