The Trunk: Morphic-cmm.1241.mcz

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

The Trunk: Morphic-cmm.1241.mcz

commits-2
Chris Muller uploaded a new version of Morphic to project The Trunk:
http://source.squeak.org/trunk/Morphic-cmm.1241.mcz

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

Name: Morphic-cmm.1241
Author: cmm
Time: 7 August 2016, 4:16:45.243689 pm
UUID: 1b1c9565-a86e-411e-adc3-849fadd9244d
Ancestors: Morphic-mt.1240

I don't like making yet another reference NewBalloonMorph, but this temporarily fixes scratchpad color for the release after some other recent new references to NewBalloonMorph were made.

=============== Diff against Morphic-mt.1240 ===============

Item was changed:
  ----- Method: SearchBar>>scratchPad (in category 'accessing') -----
  scratchPad
  ^ scratchPad ifNil:
  [ scratchPad := TextMorphForEditView new. "we should be able to use TextMorph here; fix later"
  scratchPad
  " on: #keyboardFocusChange send: #removeScratchPad to: self ;"
  on: #mouseLeave send: #removeScratchPad to: self ;
  on: #keyStroke send: #handleScratchPadKey: to: self ;
  margins: (5@0 corner: 5@0);
+ backgroundColor: ((UserInterfaceTheme current get: #color for: #NewBalloonMorph) ifNil: [ BalloonMorph balloonColor ]) ;
- backgroundColor: (BalloonMorph balloonColor alpha: 1.0) ;
  setEditView: PluggableTextMorph new ; "dummy"
  autoFit: true ;
  wrapFlag: true ;
  newContents: '--scratch area--' ;
  font: ((UserInterfaceTheme current get: #font for: #PluggableTextMorph) ifNil: [TextStyle defaultFont]);
  textColor: ((UserInterfaceTheme current get: #textColor for: #PluggableTextMorph) ifNil: [Color black]);
  caretColor: ((UserInterfaceTheme current get: #caretColor for: #PluggableTextMorph) ifNil: [Color red]);
  selectionColor: ((UserInterfaceTheme current get: #selectionColor for: #PluggableTextMorph) ifNil: [Color blue muchDarker] ifNotNil: [ : col | col twiceLighter ]);
  yourself.
  self layoutScratchPad.
  Preferences menuAppearance3d ifTrue: [ scratchPad addDropShadow ].
  scratchPad ]!