The Trunk: EToys-nice.79.mcz

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

The Trunk: EToys-nice.79.mcz

commits-2
Nicolas Cellier uploaded a new version of EToys to project The Trunk:
http://source.squeak.org/trunk/EToys-nice.79.mcz

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

Name: EToys-nice.79
Author: nice
Time: 29 December 2010, 5:05:46.331 pm
UUID: 17fbf753-04dc-4f40-a007-7e3cbf61242b
Ancestors: EToys-nice.78

Add a few spaces in order to avoid Transcript warnings about @- ambiguity when recompiling.

=============== Diff against EToys-nice.78 ===============

Item was changed:
  ----- Method: SyntaxMorph classSide>>standardInset (in category 'as yet unclassified') -----
  standardInset
 
+ ^ self alansTest1 ifTrue: [1] ifFalse: [-1 @ -1]!
- ^ self alansTest1 ifTrue: [1] ifFalse: [-1@-1]!

Item was changed:
  ----- Method: SyntaxMorph>>drawOn: (in category 'drawing') -----
  drawOn: aCanvas
 
  super drawOn: aCanvas.
  self isBlockNode ifFalse: [^self].
  self alansTest1 ifTrue: [^self].
 
  self immediatelyBelowTheMethodNode ifTrue: [
+ aCanvas fillRectangle: (self topLeft + (0 @ -1) extent: self width @ 1) color: Color gray
- aCanvas fillRectangle: (self topLeft + (0@-1) extent: self width@1) color: Color gray
  ] ifFalse: [
+ aCanvas fillRectangle: (self topLeft + (1 @ 1) extent: 2 @ (self height-2)) color: Color gray.
+ aCanvas fillRectangle: (self topLeft + (1 @ 1) extent: 4 @ 1) color: Color gray.
+ aCanvas fillRectangle: (self bottomLeft + (1 @ -1) extent: 4 @ 1) color: Color gray
- aCanvas fillRectangle: (self topLeft + (1@1) extent: 2@(self height-2)) color: Color gray.
- aCanvas fillRectangle: (self topLeft + (1@1) extent: 4@1) color: Color gray.
- aCanvas fillRectangle: (self bottomLeft + (1@-1) extent: 4@1) color: Color gray
  ].
  !

Item was changed:
  ----- Method: SyntaxMorph>>selectorMenuAsk: (in category 'pop ups') -----
  selectorMenuAsk: listOfLists
  "I represent a SelectorNode to be replaced by one of the selectors in one of the category lists.  Each list has pre-built StringMorphs in it."
 
  | menu |
  listOfLists isEmpty ifTrue: [^ nil].
  listOfLists first addFirst: (self aSimpleStringMorphWith: '( Cancel )').
  listOfLists first first color: Color red.
  menu := RectangleMorph new.
+ menu listDirection: #leftToRight; layoutInset: 3; cellInset: 1 @ 0.
- menu listDirection: #leftToRight; layoutInset: 3; cellInset: 1@0.
  menu layoutPolicy: TableLayout new; hResizing: #shrinkWrap;
  vResizing: #shrinkWrap; color: (Color r: 0.767 g: 1.0 b: 0.767);
  useRoundedCorners; cellPositioning: #topLeft.
  listOfLists do: [:ll | | col |
  col := Morph new.
+ col listDirection: #topToBottom; layoutInset: 0; cellInset: 0 @ 0.
- col listDirection: #topToBottom; layoutInset: 0; cellInset: 0@0.
  col layoutPolicy: TableLayout new; hResizing: #shrinkWrap.
  col color: Color transparent; vResizing: #shrinkWrap.
  menu addMorphBack: col.
  ll do: [:ss |
  col addMorphBack: ss.
  ss on: #mouseUp send: #replaceKeyWord:menuItem: to: self]
  ].
  self world addMorph: menu.
+ menu setConstrainedPosition: (owner localPointToGlobal: self topRight) + (10 @ -30)
- menu setConstrainedPosition: (owner localPointToGlobal: self topRight) + (10@-30)
  hangOut: false.
  !

Item was changed:
  ----- Method: SyntaxMorph>>standardInset (in category 'alans styles') -----
  standardInset
 
+ parseNode class == BlockNode ifTrue: [^ 5 @ 1].
- parseNode class == BlockNode ifTrue: [^ 5@1].
  "allow pointing beside a line so can replace it"
  ^ self alansTest1 ifTrue: [1] ifFalse: [-1]!