Squeak-dev December 2010

squeak-dev@lists.squeakfoundation.org

95 participants
379 discussions

The Trunk: EToys-nice.79.mcz
by commits＠source.squeak.org 29 Dec '10

29 Dec '10

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]!

1 0

rST on Squeak 4.1?
by Lawson English 29 Dec '10

29 Dec '10

Has anyone gotten rST (remote smalltalk framework) to work with Squeak 4.1? The latest packages load, but the sample client code dies immediately with aMessageNotUnderstood ByteString>>aslpString I can bypass that with a hardcoded URL, but then I get into issues with RSTRemoteBojectProxy and RSTBroker that I don't understand at all. http://www.squeaksource.com/rST.html Thanks. Lawson

1 1

The Trunk: ST80-nice.121.mcz
by commits＠source.squeak.org 29 Dec '10

29 Dec '10

Nicolas Cellier uploaded a new version of ST80 to project The Trunk: http://source.squeak.org/trunk/ST80-nice.121.mcz ==================== Summary ==================== Name: ST80-nice.121 Author: nice Time: 29 December 2010, 4:21:35.51 pm UUID: a6adba3b-7694-4b0b-b933-027440aaf8f9 Ancestors: ST80-ul.120 Add a few spaces in order to avoid Transcript warnings about @- ambiguity when recompiling. Test Integer equality with = rather than == . =============== Diff against ST80-ul.120 =============== Item was changed: ----- Method: ParagraphEditor>>sameColumn:newLine:forward: (in category 'private') ----- sameColumn: start newLine: lineBlock forward: isForward "Private - Compute the index in my text with the line number derived from lineBlock," " a one argument block accepting the old line number. The position inside the line will be preserved as good as possible" "The boolean isForward is used in the border case to determine if we should move to the beginning or the end of the line." | wordStyle column currentLine offsetAtTargetLine targetEOL lines numberOfLines currentLineNumber targetLineNumber | wordStyle := Preferences wordStyleCursorMovement. wordStyle ifTrue: [ lines := paragraph lines. numberOfLines := paragraph numberOfLines. currentLineNumber := paragraph lineIndexOfCharacterIndex: start. currentLine := lines at: currentLineNumber] ifFalse: [ lines := self lines. numberOfLines := lines size. currentLine := lines detect:[:lineInterval | lineInterval last >= start] ifNone:[lines last]. currentLineNumber := currentLine second]. column := start - currentLine first. targetLineNumber := ((lineBlock value: currentLineNumber) max: 1) min: numberOfLines. offsetAtTargetLine := (lines at: targetLineNumber) first. + targetEOL := (lines at: targetLineNumber) last + (targetLineNumber = numberOfLines ifTrue:[1]ifFalse:[0]). + targetLineNumber = currentLineNumber - targetEOL := (lines at: targetLineNumber) last + (targetLineNumber == numberOfLines ifTrue:[1]ifFalse:[0]). - targetLineNumber == currentLineNumber "No movement or movement failed. Move to beginning or end of line." ifTrue:[^isForward ifTrue:[targetEOL] ifFalse:[offsetAtTargetLine]]. ^offsetAtTargetLine + column min: targetEOL.! Item was changed: ----- Method: StandardSystemController>>cursorOnBorder (in category 'borders') ----- cursorOnBorder | cp i box | view isCollapsed ifTrue: [^ false]. cp := sensor cursorPoint. + ((view labelDisplayBox insetBy: (0 @ 2 corner: 0 @ -2)) containsPoint: cp) - ((view labelDisplayBox insetBy: (0@2 corner: 0@-2)) containsPoint: cp) ifTrue: [^ false]. (i := view subViews findFirst: [:v | v displayBox containsPoint: cp]) = 0 ifTrue: [box := view windowBox] ifFalse: [box := (view subViews at: i) insetDisplayBox]. ^ ((box insetBy: 3) containsPoint: cp) not and: [(box expandBy: 4) containsPoint: cp]! Item was changed: ----- Method: StandardSystemView>>closeBoxFrame (in category 'label access') ----- closeBoxFrame + ^ Rectangle origin: (self labelDisplayBox leftCenter + (10 @ -5)) extent: (11 @ 11)! - ^ Rectangle origin: (self labelDisplayBox leftCenter + (10@-5)) extent: (11@11)! Item was changed: ----- Method: StandardSystemView>>growBoxFrame (in category 'label access') ----- growBoxFrame + ^ Rectangle origin: (self labelDisplayBox rightCenter + (-22 @ -5)) extent: (11 @ 11)! - ^ Rectangle origin: (self labelDisplayBox rightCenter + (-22@-5)) extent: (11@11)!

1 0

The Trunk: MorphicExtras-nice.98.mcz
by commits＠source.squeak.org 29 Dec '10

29 Dec '10

Nicolas Cellier uploaded a new version of MorphicExtras to project The Trunk: http://source.squeak.org/trunk/MorphicExtras-nice.98.mcz ==================== Summary ==================== Name: MorphicExtras-nice.98 Author: nice Time: 29 December 2010, 4:18:13.421 pm UUID: a61e9f05-6a6f-4590-a274-18423b8336f5 Ancestors: MorphicExtras-cmm.97 Add a few spaces in order to avoid Transcript warnings about @- ambiguity when recompiling. =============== Diff against MorphicExtras-cmm.97 =============== Item was changed: ----- Method: FlapTab>>fitContents (in category 'misc') ----- fitContents self isCurrentlyTextual ifFalse: [^ super fitContents]. self ifVertical: + [self extent: submorphs first extent + (2 * self borderWidth) + (0 @ 4). + submorphs first position: self position + self borderWidth + (1 @ 4)] - [self extent: submorphs first extent + (2 * self borderWidth) + (0@4). - submorphs first position: self position + self borderWidth + (1@4)] ifHorizontal: + [self extent: submorphs first extent + (2 * self borderWidth) + (8 @ -1). + submorphs first position: self position + self borderWidth + (5 @ 1)]! - [self extent: submorphs first extent + (2 * self borderWidth) + (8@-1). - submorphs first position: self position + self borderWidth + (5@1)]! Item was changed: ----- Method: PaintBoxMorph>>fixUpColorPicker (in category 'recent colors') ----- fixUpColorPicker | chart picker | + chart := ColorChart ifNil: [ColorChart := Cursor wait showWhile: [(ColorPickerMorph colorPaletteForDepth: 16 extent: 120 @ 89)]]. - chart := ColorChart ifNil:[Cursor wait showWhile:[ColorChart := (ColorPickerMorph colorPaletteForDepth: 16 extent: 120@89)]]. chart getCanvas frameRectangle: chart boundingBox color: Color black. + picker := Form extent: (chart extent + (14 @ 12)) depth: 16. - picker := Form extent: (chart extent + (14@12)) depth: 16. picker fillWhite. "top" + picker copy: (0 @ 0 extent: picker width @ 6) + from: (colorMemory image width - picker width) @ 0 - picker copy: (0@0 extent: picker width@6) - from: (colorMemory image width - picker width)@0 in: colorMemory image rule: Form over. "bottom" + picker copy: (0 @ (picker height - 6) extent: picker width @ 6) + from: (colorMemory image width - picker width) @ (colorMemory image height - 7) - picker copy: (0@ (picker height-6) extent: picker width@6) - from: (colorMemory image width - picker width)@(colorMemory image height - 7) in: colorMemory image rule: Form over. "left" + picker copy: (0 @ 6 corner: 8 @ (picker height - 6)) + from: (colorMemory image boundingBox topLeft + (0 @ 6)) - picker copy: (0@6 corner: 8@(picker height - 6)) - from: (colorMemory image boundingBox topLeft + (0@6)) in: colorMemory image rule: Form over. "right" + picker copy: (picker width-6 @ 6 corner: picker width @ (picker height - 6)) + from: (colorMemory image boundingBox topRight - (6 @ -6)) - picker copy: (picker width-6@6 corner: picker width@(picker height - 6)) - from: (colorMemory image boundingBox topRight - (6@-6)) in: colorMemory image rule: Form over. + chart displayOn: picker at: 8 @ 6. - chart displayOn: picker at: 8@6. picker getCanvas frameRectangle: picker boundingBox color: Color black. colorMemory image: picker. ! Item was changed: ----- Method: PaintBoxMorph>>init4 (in category 'initialization') ----- init4 "Just a record of how Ted loaded in the paintbox button images, Feb 98" + | bb im pp newImage pic24Bit picNewBit blt | - | bb im pp newImage pic24Bit picNewBit blt | + "self loadoffImage: 'roundedPalette3.bmp'." + pic24Bit := GIFReadWriter formFromServerFile: 'updates/137roundedPalette3.bmp'. + picNewBit := Form extent: pic24Bit extent depth: 16. + pic24Bit displayOn: picNewBit. + OriginalBounds := picNewBit boundingBox. + AllOffImage := Form extent: OriginalBounds extent depth: 16. + blt := BitBlt current toForm: AllOffImage. + blt sourceForm: picNewBit; combinationRule: Form over; + sourceRect: OriginalBounds; destOrigin: 0 @ 0; copyBits. - "self loadoffImage: 'roundedPalette3.bmp'." - pic24Bit := GIFReadWriter formFromServerFile: 'updates/137roundedPalette3.bmp'. - picNewBit := Form extent: pic24Bit extent depth: 16. - pic24Bit displayOn: picNewBit. - OriginalBounds := picNewBit boundingBox. - AllOffImage := Form extent: OriginalBounds extent depth: 16. - blt := BitBlt current toForm: AllOffImage. - blt sourceForm: picNewBit; combinationRule: Form over; - sourceRect: OriginalBounds; destOrigin: 0@0; copyBits. + AllOffImage mapColor: Color transparent to: Color black. + self image: AllOffImage. + self invalidRect: bounds. - AllOffImage mapColor: Color transparent to: Color black. - self image: AllOffImage. - self invalidRect: bounds. + self submorphsDo: [:button | button position: button position + (10 @ 10)]. + (im := submorphs at: 28) class == ImageMorph ifTrue: [ + im position: im position + (2 @ 0)]. "color picker" + "exercise it once" - self submorphsDo: [:button | button position: button position + (10@10)]. - (im := submorphs at: 28) class == ImageMorph ifTrue: [ - im position: im position + (2@0)]. "color picker" - "exercise it once" + (bb := self submorphNamed: #keep:) position: bb position + (0 @ 25). + (bb := self submorphNamed: #toss:) position: bb position + (0 @ 25). + (bb := self submorphNamed: #undo:) position: bb position + (0 @ -25). + (bb := self submorphNamed: #clear:) position: bb position + (0 @ -25). + (bb := self submorphNamed: #undo:) position: bb position + (0 @ -69). + (bb := self submorphNamed: #clear:) position: bb position + (0 @ -69). + self submorphsDo: [:button | + button class == AlignmentMorph ifTrue: [ + button position: button position + (0 @ 25)]. + (button printString includesSubString: 'stamp:') ifTrue: [ + button position: button position + (0 @ 25)]]. + (bb := self submorphNamed: #prevStamp:) position: bb position + (0 @ 25). + (bb := self submorphNamed: #nextStamp:) position: bb position + (0 @ 25). - (bb := self submorphNamed: #keep:) position: bb position + (0@25). - (bb := self submorphNamed: #toss:) position: bb position + (0@25). - (bb := self submorphNamed: #undo:) position: bb position + (0@-25). - (bb := self submorphNamed: #clear:) position: bb position + (0@-25). - (bb := self submorphNamed: #undo:) position: bb position + (0@-69). - (bb := self submorphNamed: #clear:) position: bb position + (0@-69). - self submorphsDo: [:button | - button class == AlignmentMorph ifTrue: [ - button position: button position + (0@25)]. - (button printString includesSubString: 'stamp:') ifTrue: [ - button position: button position + (0@25)]]. - (bb := self submorphNamed: #prevStamp:) position: bb position + (0@25). - (bb := self submorphNamed: #nextStamp:) position: bb position + (0@25). + bb := self submorphNamed: #keep:. + newImage := bb pressedImage copy: (0 @ 4 corner: (bb pressedImage boundingBox extent)). + bb onImage: newImage. bb pressedImage: newImage. bb extent: newImage extent. + bb position: bb position + (4 @ 1). - bb := self submorphNamed: #keep:. - newImage := bb pressedImage copy: (0@4 corner: (bb pressedImage boundingBox extent)). - bb onImage: newImage. bb pressedImage: newImage. bb extent: newImage extent. - bb position: bb position + (4@1). + pp := (bb := self submorphNamed: #toss:) pressedImage. + newImage := pp copy: (0 @ 4 corner: (bb pressedImage extent - (3 @ 0))). + bb onImage: newImage. bb pressedImage: newImage. + bb extent: newImage extent. + bb position: bb position + (3 @ 1). - pp := (bb := self submorphNamed: #toss:) pressedImage. - newImage := pp copy: (0@4 corner: (bb pressedImage extent - (3@0))). - bb onImage: newImage. bb pressedImage: newImage. - bb extent: newImage extent. - bb position: bb position + (3@1). + pp := (bb := self submorphNamed: #undo:) pressedImage. + newImage := pp copy: (0 @ 0 corner: (bb pressedImage extent - (3 @ 5))). + bb onImage: newImage. bb pressedImage: newImage. + bb extent: newImage extent. + bb position: bb position + (3 @ -1). - pp := (bb := self submorphNamed: #undo:) pressedImage. - newImage := pp copy: (0@0 corner: (bb pressedImage extent - (3@5))). - bb onImage: newImage. bb pressedImage: newImage. - bb extent: newImage extent. - bb position: bb position + (3@-1). + pp := (bb := self submorphNamed: #clear:) pressedImage. + newImage := pp copy: (0 @ 0 corner: (bb pressedImage extent - (0 @ 5))). + bb onImage: newImage. bb pressedImage: newImage. + bb extent: newImage extent. + bb position: bb position + (3 @ -1). - pp := (bb := self submorphNamed: #clear:) pressedImage. - newImage := pp copy: (0@0 corner: (bb pressedImage extent - (0@5))). - bb onImage: newImage. bb pressedImage: newImage. - bb extent: newImage extent. - bb position: bb position + (3@-1). + pic24Bit := GIFReadWriter formFromServerFile: 'updates/137pencil.bmp'. + picNewBit := Form extent: pic24Bit extent depth: 16. + pic24Bit displayOn: picNewBit. + newImage := picNewBit as8BitColorForm. + newImage transparentColor: (Color r: 0 g: 0 b: 0). + (bb := self submorphNamed: #erase:) pressedImage: newImage; onImage: newImage; + extent: newImage extent. - pic24Bit := GIFReadWriter formFromServerFile: 'updates/137pencil.bmp'. - picNewBit := Form extent: pic24Bit extent depth: 16. - pic24Bit displayOn: picNewBit. - newImage := picNewBit as8BitColorForm. - newImage transparentColor: (Color r: 0 g: 0 b: 0). - (bb := self submorphNamed: #erase:) pressedImage: newImage; onImage: newImage; - extent: newImage extent. + bb position: bb position + (-11 @ -1). - bb position: bb position + (-11@-1). ! Item was changed: ----- Method: PianoKeyboardMorph>>buildKeyboard (in category 'simple keyboard') ----- buildKeyboard | wtWid bkWid keyRect octavePt nWhite nBlack | self removeAllMorphs. wtWid := 8. bkWid := 5. + self extent: 10 @ 10. + 1 to: nOctaves + 1 do: - self extent: 10@10. - 1 to: nOctaves+1 do: [:i | i <= nOctaves ifTrue: [nWhite := 7. nBlack := 5] ifFalse: [nWhite := 1. nBlack := 0 "High C"]. + octavePt := self innerBounds topLeft + ((7 * wtWid * (i - 1) - 1) @ -1). - octavePt := self innerBounds topLeft + ((7*wtWid*(i-1)-1)@-1). 1 to: nWhite do: + [:j | keyRect := octavePt + (j - 1 * wtWid @ 0) extent: (wtWid + 1) @ 36. - [:j | keyRect := octavePt + (j-1*wtWid@0) extent: (wtWid+1)@36. self addMorph: ((RectangleMorph newBounds: keyRect color: whiteKeyColor) borderWidth: 1; on: #mouseDown send: #mouseDownPitch:event:noteMorph: to: self + withValue: i - 1 * 12 + (#(1 3 5 6 8 10 12) at: j))]. - withValue: i-1*12 + (#(1 3 5 6 8 10 12) at: j))]. 1 to: nBlack do: + [:j | keyRect := octavePt + ((#(6 15 29 38 47) at: j) @ 1) extent: bkWid @ 21. - [:j | keyRect := octavePt + ((#(6 15 29 38 47) at: j)@1) extent: bkWid@21. self addMorph: ((Morph newBounds: keyRect color: blackKeyColor) on: #mouseDown send: #mouseDownPitch:event:noteMorph: to: self + withValue: i - 1 * 12 + (#(2 4 7 9 11) at: j))]]. - withValue: i-1*12 + (#(2 4 7 9 11) at: j))]]. self submorphsDo: [:m | m on: #mouseMove send: #mouseMovePitch:event:noteMorph: to: self; on: #mouseUp send: #mouseUpPitch:event:noteMorph: to: self; on: #mouseEnterDragging send: #mouseDownPitch:event:noteMorph: to: self; on: #mouseLeaveDragging send: #mouseUpPitch:event:noteMorph: to: self]. self extent: (self fullBounds extent + borderWidth - 1)! Item was changed: ----- Method: PostscriptDummyWarp>>subCanvas: (in category 'dummy') ----- subCanvas:patchRect subCanvas ifNil: + [ subCanvas := PostscriptCanvas new reset setOrigin:patchRect topLeft clipRect: (-10000 @ -10000 extent: 20000 @ 20000)]. - [ subCanvas := PostscriptCanvas new reset setOrigin:patchRect topLeft clipRect:(-10000@-10000 extent:20000@20000)]. ^subCanvas. !

1 0

The Trunk: Morphic-nice.502.mcz
by commits＠source.squeak.org 29 Dec '10

29 Dec '10

Nicolas Cellier uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-nice.502.mcz ==================== Summary ==================== Name: Morphic-nice.502 Author: nice Time: 29 December 2010, 4:12:44.089 pm UUID: 46f308ec-bfaf-4cca-abeb-ccda9b2c6f4f Ancestors: Morphic-mtf.501 Add a few spaces in order to avoid Transcript warnings about @- ambiguity when recompiling. =============== Diff against Morphic-mtf.501 =============== Item was changed: ----- Method: BalloonCanvas>>makeRoundRectShape:radius: (in category 'private') ----- makeRoundRectShape: aRectangle radius: radius "decompose a rounded rectangle into bezier form" | ovalDiameter rectExtent segments points endPoint seg idx offset rectOffset | ovalDiameter := (radius * 2) asPoint min: aRectangle extent. + (ovalDiameter x <= 0 or: [ovalDiameter y <= 0]) ifTrue: [ - (ovalDiameter x <= 0 or:[ovalDiameter y <= 0]) ifTrue:[ "degenerates into rectangle - just hand back four lines" | topLeft topRight bottomLeft bottomRight | topLeft := aRectangle topLeft. topRight := aRectangle topRight. bottomLeft := aRectangle bottomLeft. bottomRight := aRectangle bottomRight. + points := Array new: 4 * 3. - points := Array new: 4*3. points at: 1 put: topLeft. points at: 2 put: topLeft. points at: 3 put: topRight. points at: 4 put: topRight. points at: 5 put: topRight. points at: 6 put: bottomRight. points at: 7 put: bottomRight. points at: 8 put: bottomRight. points at: 9 put: bottomLeft. points at: 10 put: bottomLeft. points at: 11 put: bottomLeft. points at: 12 put: topLeft. ^points ]. rectExtent := aRectangle extent - ovalDiameter. rectOffset := aRectangle origin. + segments := Bezier2Segment makeEllipseSegments: (0 @ 0 extent: ovalDiameter). - segments := Bezier2Segment makeEllipseSegments: (0@0 extent: ovalDiameter). "patch up the segments to include lines connecting the oval parts. we need: 8*3 points for the oval parts + 4*3 points for the connecting lines" + points := Array new: 12 * 3. - points := Array new: 12*3. idx := 0. "Tweaked offsets to clean up curves. MAD" + endPoint := segments last end + rectOffset + (0 @ -1). + 1 to: 8 by: 2 do: [:i | + i = 1 ifTrue: [offset := rectOffset + (rectExtent x @ 0) + (1 @ -1)]. "top, tr" + i = 3 ifTrue: [offset := rectOffset + rectExtent + (1 @ 1)]. "right, br" + i = 5 ifTrue: [offset := rectOffset + (0 @ rectExtent y) + (0 @ 1)]. "bottom, bl" + i = 7 ifTrue: [offset := rectOffset + (0 @ -1)]."left, tl" - endPoint := segments last end + rectOffset + (0@-1). - 1 to: 8 by: 2 do:[:i| - i = 1 ifTrue:[offset := rectOffset + (rectExtent x @ 0) + (1@-1)]. "top, tr" - i = 3 ifTrue:[offset := rectOffset + rectExtent + (1@1)]. "right, br" - i = 5 ifTrue:[offset := rectOffset + (0 @ rectExtent y) + (0@1)]. "bottom, bl" - i = 7 ifTrue:[offset := rectOffset + (0@-1)]."left, tl" seg := segments at: i. "insert a line segment for the horizontal part of the round rect" + points at: (idx := idx + 1) put: endPoint. + points at: (idx := idx + 1) put: endPoint. + points at: (idx := idx + 1) put: seg start + offset. - points at: (idx := idx+1) put: endPoint. - points at: (idx := idx+1) put: endPoint. - points at: (idx := idx+1) put: seg start + offset. "now the first half-arc" + points at: (idx := idx + 1) put: seg start + offset. + points at: (idx := idx + 1) put: seg via + offset. + points at: (idx := idx + 1) put: seg end + offset. - points at: (idx := idx+1) put: seg start + offset. - points at: (idx := idx+1) put: seg via + offset. - points at: (idx := idx+1) put: seg end + offset. "the second half-arc" + seg := segments at: i + 1. + points at: (idx := idx + 1) put: seg start + offset. + points at: (idx := idx + 1) put: seg via + offset. + points at: (idx := idx + 1) put: seg end + offset. - seg := segments at: i+1. - points at: (idx := idx+1) put: seg start + offset. - points at: (idx := idx+1) put: seg via + offset. - points at: (idx := idx+1) put: seg end + offset. endPoint := seg end + offset. ]. ^points! Item was changed: ----- Method: MorphicProject>>setAsBackground: (in category 'utilities') ----- setAsBackground: aForm "Set aForm as a background image." + | thisWorld newColor | + thisWorld := self currentWorld. - | world newColor | - world := self currentWorld. newColor := InfiniteForm with: aForm. aForm rememberCommand: (Command new cmdWording: 'set background to a picture' translated; + undoTarget: thisWorld selector: #color: argument: thisWorld color; + redoTarget: thisWorld selector: #color: argument: newColor). + thisWorld color: newColor - undoTarget: world selector: #color: argument: world color; - redoTarget: world selector: #color: argument: newColor). - world color: newColor ! Item was changed: ----- Method: PolygonMorph>>nudgeForLabel: (in category 'attachments') ----- nudgeForLabel: aRectangle "Try to move the label off me. Prefer labels on the top and right." | i flags nudge | + (self bounds intersects: aRectangle) ifFalse: [^ 0 @ 0 ]. - (self bounds intersects: aRectangle) ifFalse: [^ 0@0 ]. flags := 0. + nudge := 0 @ 0. - nudge := 0@0. i := 1. aRectangle lineSegmentsDo: [ :rp1 :rp2 | | rectSeg | rectSeg := LineSegment from: rp1 to: rp2. self straightLineSegmentsDo: [ :lp1 :lp2 | | polySeg int | polySeg := LineSegment from: lp1 to: lp2. int := polySeg intersectionWith: rectSeg. int ifNotNil: [ flags := flags bitOr: i ]. ]. i := i * 2. ]. "Now flags has bitflags for which sides" nudge := flags caseOf: { "no intersection" + [ 0 ] -> [ 0 @ 0 ]. - [ 0 ] -> [ 0@0 ]. "2 adjacent sides only" + [ 9 ] -> [ 1 @ 1 ]. + [ 3 ] -> [ -1 @ 1 ]. + [ 12 ] -> [ 1 @ -1 ]. + [ 6 ] -> [ -1 @ -1 ]. - [ 9 ] -> [ 1@1 ]. - [ 3 ] -> [ -1@1 ]. - [ 12 ] -> [ 1@-1 ]. - [ 6 ] -> [ -1@-1 ]. "2 opposite sides only" + [ 10 ] -> [ 0 @ -1 ]. + [ 5 ] -> [ 1 @ 0 ]. - [ 10 ] -> [ 0@-1 ]. - [ 5 ] -> [ 1@0 ]. "only 1 side" + [ 8 ] -> [ -1 @ 0 ]. + [ 1 ] -> [ 0 @ -1 ]. + [ 2 ] -> [ 1 @ 0 ]. + [ 4 ] -> [ 0 @ 1 ]. - [ 8 ] -> [ -1@0 ]. - [ 1 ] -> [ 0@-1 ]. - [ 2 ] -> [ 1@0 ]. - [ 4 ] -> [ 0@1 ]. "3 sides" + [ 11 ] -> [ 0 @ 1 ]. + [ 13 ] -> [ 1 @ 0 ]. + [ 14 ] -> [ 0 @ -1 ]. + [ 7 ] -> [ -1 @ 0 ]. - [ 11 ] -> [ 0@1 ]. - [ 13 ] -> [ 1@0 ]. - [ 14 ] -> [ 0@-1 ]. - [ 7 ] -> [ -1@0 ]. "all sides" + [ 15 ] -> [ 1 @ -1 "move up and to the right" ]. - [ 15 ] -> [ 1@-1 "move up and to the right" ]. }. ^nudge! Item was changed: ----- Method: PreDebugWindow>>adjustBookControls (in category 'as yet unclassified') ----- adjustBookControls | inner | proceedButton ifNil: [^ self]. + proceedButton align: proceedButton topLeft with: (inner := self innerBounds) topLeft + (35 @ -4). + debugButton align: debugButton topRight with: inner topRight - (16 @ 4).! - proceedButton align: proceedButton topLeft with: (inner := self innerBounds) topLeft + (35@-4). - debugButton align: debugButton topRight with: inner topRight - (16@4).! Item was changed: ----- Method: ScrollPane>>vResizeScrollBar (in category 'geometry') ----- vResizeScrollBar | w topLeft borderHeight innerWidth | w := self scrollBarThickness. innerWidth := self flatColoredScrollBarLook ifTrue: [borderHeight := borderWidth. 0] ifFalse: [borderHeight := 0. 1]. topLeft := scrollBarOnLeft ifTrue: [retractableScrollBar ifTrue: [bounds topLeft - ((w - borderWidth) @ (0 - borderHeight))] ifFalse: [bounds topLeft + ((borderWidth - innerWidth) @ borderHeight)]] ifFalse: [retractableScrollBar ifTrue: [bounds topRight - (borderWidth @ (0 - borderHeight))] ifFalse: [bounds topRight - ((w + borderWidth - innerWidth) @ (0 - borderHeight))]]. scrollBar + bounds: (topLeft + ((scrollBarOnLeft ifTrue: [-1] ifFalse: [1]) @ -1) extent: w @ self vScrollBarHeight) - bounds: (topLeft + ((scrollBarOnLeft ifTrue: [-1] ifFalse: [1]) @-1) extent: w @ self vScrollBarHeight) ! Item was changed: ----- Method: TTSampleFontMorph>>drawCharactersOn: (in category 'drawing') ----- drawCharactersOn: aCanvas | glyph origin r offset cy m | + 0 to: 255 do: [:i | - 0 to: 255 do:[:i| glyph := font at: i. origin := font bounds extent * ((i \\ 16) @ (i // 16)). r := origin extent: font bounds extent. offset := r center - glyph bounds center. cy := glyph bounds center y. m := MatrixTransform2x3 withOffset: 0@cy. + m := m composedWithLocal: (MatrixTransform2x3 withScale: 1 @ -1). + m := m composedWithLocal: (MatrixTransform2x3 withOffset: 0 @ cy negated). - m := m composedWithLocal: (MatrixTransform2x3 withScale: 1@-1). - m := m composedWithLocal: (MatrixTransform2x3 withOffset: 0@cy negated). m := m composedWithGlobal: (MatrixTransform2x3 withOffset: offset). + aCanvas asBalloonCanvas preserveStateDuring: [:balloonCanvas | - aCanvas asBalloonCanvas preserveStateDuring:[:balloonCanvas| balloonCanvas transformBy: m. balloonCanvas drawGeneralBezierShape: glyph contours color: color borderWidth: 0 borderColor: Color black. ]. ].! Item was changed: ----- Method: TTSampleStringMorph>>computeTransform (in category 'private') ----- computeTransform | cy | cy := bounds origin y + bounds corner y * 0.5. transform := MatrixTransform2x3 transformFromLocal: (ttBounds insetBy: borderWidth negated) toGlobal: bounds. + transform := transform composedWithGlobal:(MatrixTransform2x3 withOffset: 0 @ cy negated). + transform := transform composedWithGlobal:(MatrixTransform2x3 withScale: 1.0 @ -1.0). + transform := transform composedWithGlobal:(MatrixTransform2x3 withOffset: 0 @ cy). - transform := transform composedWithGlobal:(MatrixTransform2x3 withOffset: 0@cy negated). - transform := transform composedWithGlobal:(MatrixTransform2x3 withScale: 1.0(a)-1.0). - transform := transform composedWithGlobal:(MatrixTransform2x3 withOffset: 0@cy). ^transform!

1 0

The Trunk: Kernel-nice.537.mcz
by commits＠source.squeak.org 29 Dec '10

29 Dec '10

Nicolas Cellier uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-nice.537.mcz ==================== Summary ==================== Name: Kernel-nice.537 Author: nice Time: 29 December 2010, 4:08:14.914 pm UUID: e06ac3d0-0ae3-433e-9530-8663459c4a15 Ancestors: Kernel-nice.536 Add a few spaces in order to avoid Transcript warnings about @- ambiguity when recompiling. =============== Diff against Kernel-nice.536 =============== Item was changed: ----- Method: MethodFinder>>testFromTuple: (in category 'initialize') ----- testFromTuple: nth "verify that the methods allowed don't crash the system. Try N of each of the fundamental types. up to 4 of each kind." | objects nonRepeating even other aa cnt | objects := #((1 4 17 42) ($a $b $c $d) ('one' 'two' 'three' 'four') (x + rect: new) ((a b 1 4) (c 1 5) ($a 3 d) ()) (4.5 0.0 3.2 100.3) ). objects := objects, {{true. false. true. false}. {Point. SmallInteger. Association. Array}. {Point class. SmallInteger class. Association class. Array class}. "{ 4 blocks }." {Date today. '1 Jan 1950' asDate. '25 Aug 1987' asDate. '1 Jan 2000' asDate}. {'15:16' asTime. '1:56' asTime. '4:01' asTime. '6:23' asTime}. {Dictionary new. Dictionary new. Dictionary new. Dictionary new}. {#(a b 1 4) asOrderedCollection. #(c 1 5) asOrderedCollection. #($a 3 d) asOrderedCollection. #() asOrderedCollection}. + {3 -> true. 5.6 -> $a. #x -> 2. 'abcd' -> false}. + {9 @ 3 extent: 5 @ 4. 0 @ 0 extent: 45 @ 9. -3 @ -7 extent: 2 @ 2. 4 @ 4 extent: 16 @ 16}. - {3->true. 5.6->$a. #x->2. 'abcd'->false}. - {9@3 extent: 5@4. 0@0 extent: 45@9. -3@-7 extent: 2@2. 4@4 extent: 16@16}. {Color red. Color blue. Color black. Color gray}}. self test2: objects. "rec+0, rec+1, rec+2, rec+3 need to be tested. " cnt := 0. nth to: 4 do: [:take | nonRepeating := OrderedCollection new. objects do: [:each | nonRepeating addAll: (each copyFrom: 1 to: take)]. "all combinations of take, from nonRepeating" even := true. nonRepeating combinations: take atATimeDo: [:tuple | even ifTrue: [other := tuple clone] ifFalse: [self load: (aa := Array with: tuple with: 1 with: other with: 7). + (cnt := cnt + 1) \\ 50 = 0 ifTrue: [ - (cnt := cnt+1) \\ 50 = 0 ifTrue: [ Transcript cr; show: aa first printString]. self search: true. self test2: aa. self test2: nonRepeating. "self test2: objects"]. even := even not]. ].! Item was changed: ----- Method: MethodFinder>>testRandom (in category 'initialize') ----- testRandom "verify that the methods allowed don't crash the system. Pick 3 or 4 from a mixed list of the fundamental types." | objects other aa cnt take tuple fName sss | objects := #((1 4 17 42) ($a $b $c $d) ('one' 'two' 'three' 'four') (x + rect: new) ((a b 1 4) (c 1 5) ($a 3 d) ()) (4.5 0.0 3.2 100.3) ). objects := objects, {{true. false. true. false}. {Point. SmallInteger. Association. Array}. {Point class. SmallInteger class. Association class. Array class}. "{ 4 blocks }." {Date today. '1 Jan 1950' asDate. '25 Aug 1987' asDate. '1 Jan 2000' asDate}. {'15:16' asTime. '1:56' asTime. '4:01' asTime. '6:23' asTime}. {Dictionary new. Dictionary new. Dictionary new. Dictionary new}. {#(a b 1 4) asOrderedCollection. #(c 1 5) asOrderedCollection. #($a 3 d) asOrderedCollection. #() asOrderedCollection}. + {3 -> true. 5.6 -> $a. #x -> 2. 'abcd' -> false}. + {9 @ 3 extent: 5 @ 4. 0 @ 0 extent: 45 @ 9. -3 @ -7 extent: 2 @ 2. 4 @ 4 extent: 16 @ 16}. - {3->true. 5.6->$a. #x->2. 'abcd'->false}. - {9@3 extent: 5@4. 0@0 extent: 45@9. -3@-7 extent: 2@2. 4@4 extent: 16@16}. {Color red. Color blue. Color black. Color gray}}. self test2: objects. "rec+0, rec+1, rec+2, rec+3 need to be tested. " fName := (FileDirectory default fileNamesMatching: '*.ran') first. sss := fName splitInteger first. (Collection classPool at: #RandomForPicking) seed: sss. cnt := 0. [take := #(3 4) atRandom. tuple := (1 to: take) collect: [:ind | (objects atRandom) atRandom]. other := (1 to: take) collect: [:ind | (objects atRandom) atRandom]. self load: (aa := Array with: tuple with: 1 with: other with: 7). + ((cnt := cnt + 1) \\ 10 = 0) " | (cnt > Skip)" ifTrue: [ - ((cnt := cnt+1) \\ 10 = 0) " | (cnt > Skip)" ifTrue: [ Transcript cr; show: cnt printString; tab; tab; show: aa first printString]. cnt > (Smalltalk at: #StopHere) ifTrue: [self halt]. "stop just before crash" cnt > (Smalltalk at: #Skip) ifTrue: ["skip this many at start" self search: true. self test2: aa first. self test2: (aa at: 3). "self test2: objects" ]. true] whileTrue. !

1 0

The Trunk: Graphics-nice.170.mcz
by commits＠source.squeak.org 29 Dec '10

29 Dec '10

Nicolas Cellier uploaded a new version of Graphics to project The Trunk: http://source.squeak.org/trunk/Graphics-nice.170.mcz ==================== Summary ==================== Name: Graphics-nice.170 Author: nice Time: 29 December 2010, 4:04:55.524 pm UUID: 872a3907-7951-40b8-991b-0b15318c5c32 Ancestors: Graphics-mtf.169 Add a few spaces in order to avoid Transcript warnings about @- ambiguity when recompiling. Remove unused charIndex instance variable from StrikeFont. =============== Diff against Graphics-mtf.169 =============== Item was changed: ----- Method: Form>>findShapeAroundSeedBlock: (in category 'filling') ----- findShapeAroundSeedBlock: seedBlock "Build a shape that is black in any region marked by seedBlock. SeedBlock will be supplied a form, in which to blacken various pixels as 'seeds'. Then the seeds are smeared until there is no change in the smear when it fills the region, ie, when smearing hits a black border and thus goes no further." | smearForm previousSmear all count smearPort | self depth > 1 ifTrue: [self halt]. "Only meaningful for B/W forms." all := self boundingBox. smearForm := Form extent: self extent. smearPort := BitBlt current toForm: smearForm. seedBlock value: smearForm. "Blacken seeds to be smeared" + smearPort copyForm: self to: 0 @ 0 rule: Form erase. "Clear any in black" - smearPort copyForm: self to: 0@0 rule: Form erase. "Clear any in black" previousSmear := smearForm deepCopy. count := 1. [count = 10 and: "check for no change every 10 smears" [count := 1. + previousSmear copy: all from: 0 @ 0 in: smearForm rule: Form reverse. - previousSmear copy: all from: 0@0 in: smearForm rule: Form reverse. previousSmear isAllWhite]] whileFalse: + [smearPort copyForm: smearForm to: 1 @ 0 rule: Form under. + smearPort copyForm: smearForm to: -1 @ 0 rule: Form under. - [smearPort copyForm: smearForm to: 1@0 rule: Form under. - smearPort copyForm: smearForm to: -1@0 rule: Form under. "After horiz smear, trim around the region border" + smearPort copyForm: self to: 0 @ 0 rule: Form erase. + smearPort copyForm: smearForm to: 0 @ 1 rule: Form under. + smearPort copyForm: smearForm to: 0 @ -1 rule: Form under. - smearPort copyForm: self to: 0@0 rule: Form erase. - smearPort copyForm: smearForm to: 0@1 rule: Form under. - smearPort copyForm: smearForm to: 0@-1 rule: Form under. "After vert smear, trim around the region border" + smearPort copyForm: self to: 0 @ 0 rule: Form erase. + count := count + 1. - smearPort copyForm: self to: 0@0 rule: Form erase. - count := count+1. count = 9 ifTrue: "Save penultimate smear for comparison" + [previousSmear copy: all from: 0 @ 0 in: smearForm rule: Form over]]. - [previousSmear copy: all from: 0@0 in: smearForm rule: Form over]]. "Now paint the filled region in me with aHalftone" ^ smearForm! Item was changed: ----- Method: Form>>pageImage:at:corner: (in category 'transitions') ----- pageImage: otherImage at: topLeft corner: corner "Produce a page-turning illusion that gradually reveals otherImage located at topLeft in this form. Corner specifies which corner, as 1=topLeft, 2=topRight, 3=bottomRight, 4=bottomLeft." | bb maskForm resultForm delta maskLoc maskRect stepSize cornerSel smallRect | stepSize := 10. bb := otherImage boundingBox. resultForm := self copy: (topLeft extent: bb extent). maskForm := Form extent: ((otherImage width min: otherImage height) + stepSize) asPoint. "maskLoc := starting loc rel to topLeft" otherImage width > otherImage height ifTrue: ["wide image; motion is horizontal." (corner between: 2 and: 3) not ifTrue: ["motion is to the right" + delta := 1 @ 0. - delta := 1@0. maskLoc := bb topLeft - (corner = 1 + ifTrue: [maskForm width @ 0] + ifFalse: [maskForm width @ stepSize])] - ifTrue: [maskForm width@0] - ifFalse: [maskForm width@stepSize])] ifFalse: ["motion is to the left" + delta := -1 @ 0. - delta := -1@0. maskLoc := bb topRight - (corner = 2 + ifTrue: [0 @ 0] + ifFalse: [0 @ stepSize])]] - ifTrue: [0@0] - ifFalse: [0@stepSize])]] ifFalse: ["tall image; motion is vertical." corner <= 2 ifTrue: ["motion is downward" + delta := 0 @ 1. - delta := 0@1. maskLoc := bb topLeft - (corner = 1 + ifTrue: [0 @ maskForm height] + ifFalse: [stepSize @ maskForm height])] - ifTrue: [0@maskForm height] - ifFalse: [stepSize@maskForm height])] ifFalse: ["motion is upward" + delta := 0 @ -1. - delta := 0@-1. maskLoc := bb bottomLeft - (corner = 3 + ifTrue: [stepSize @ 0] + ifFalse: [0 @ 0])]]. - ifTrue: [stepSize@0] - ifFalse: [0@0])]]. "Build a solid triangle in the mask form" (Pen newOnForm: maskForm) in: [:p | corner even "Draw 45-degree line" + ifTrue: [p place: 0 @ 0; turn: 135; go: maskForm width * 3 // 2] + ifFalse: [p place: 0 @ (maskForm height - 1); turn: 45; go: maskForm width * 3 // 2]]. - ifTrue: [p place: 0@0; turn: 135; go: maskForm width*3//2] - ifFalse: [p place: 0@(maskForm height-1); turn: 45; go: maskForm width*3//2]]. maskForm smear: delta negated distance: maskForm width. "Copy the mask to full resolution for speed. Make it be the reversed so that it can be used for ORing in the page-corner color" maskForm := (Form extent: maskForm extent depth: otherImage depth) + copyBits: maskForm boundingBox from: maskForm at: 0 @ 0 - copyBits: maskForm boundingBox from: maskForm at: 0@0 colorMap: (Bitmap with: 16rFFFFFFFF with: 0). "Now move the triangle maskForm across the resultForm selecting the triangular part of otherImage to display, and across the resultForm, selecting the part of the original image to erase." cornerSel := #(topLeft topRight bottomRight bottomLeft) at: corner. + 1 to: (otherImage width + otherImage height // stepSize) + 1 do: - 1 to: (otherImage width + otherImage height // stepSize)+1 do: [:i | "Determine the affected square" maskRect := (maskLoc extent: maskForm extent) intersect: bb. + ((maskLoc x * delta x) + (maskLoc y * delta y)) < 0 ifTrue: + [smallRect := 0 @ 0 extent: (maskRect width min: maskRect height) asPoint. - ((maskLoc x*delta x) + (maskLoc y*delta y)) < 0 ifTrue: - [smallRect := 0@0 extent: (maskRect width min: maskRect height) asPoint. maskRect := smallRect align: (smallRect perform: cornerSel) with: (maskRect perform: cornerSel)]. "AND otherForm with triangle mask, and OR into result" + resultForm copyBits: bb from: otherImage at: 0 @ 0 - resultForm copyBits: bb from: otherImage at: 0@0 clippingBox: maskRect rule: Form over fillColor: nil. resultForm copyBits: maskForm boundingBox from: maskForm at: maskLoc clippingBox: maskRect rule: Form erase fillColor: nil. resultForm copyBits: maskForm boundingBox from: maskForm at: maskLoc clippingBox: maskRect rule: Form under fillColor: Color lightBrown. "Now update Display in a single BLT." self copyBits: maskRect from: resultForm at: topLeft + maskRect topLeft clippingBox: self boundingBox rule: Form over fillColor: nil. Display forceDisplayUpdate. + maskLoc := maskLoc + (delta * stepSize)] - maskLoc := maskLoc + (delta*stepSize)] " 1 to: 4 do: [:corner | Display pageImage: (Form fromDisplay: (10@10 extent: 200@300)) reverse at: 10@10 corner: corner] " ! Item was changed: ----- Method: Point>>eightNeighbors (in category 'point functions') ----- eightNeighbors + ^ (Array with: self + (1 @ 0) + with: self + (1 @ 1) + with: self + (0 @ 1) + with: self + (-1 @ 1)) , + (Array with: self + (-1 @ 0) + with: self + (-1 @ -1) + with: self + (0 @ -1) + with: self + (1 @ -1)) - ^ (Array with: self + (1@0) - with: self + (1@1) - with: self + (0@1) - with: self + (-1@1)) , - (Array with: self + (-1@0) - with: self + (-1@-1) - with: self + (0@-1) - with: self + (1@-1)) ! Item was changed: ----- Method: Point>>fourNeighbors (in category 'point functions') ----- fourNeighbors + ^ Array with: self + (1 @ 0) + with: self + (0 @ 1) + with: self + (-1 @ 0) + with: self + (0 @ -1) - ^ Array with: self + (1@0) - with: self + (0@1) - with: self + (-1@0) - with: self + (0@-1) ! Item was changed: AbstractFont subclass: #StrikeFont + instanceVariableNames: 'characterToGlyphMap xTable glyphs name type minAscii maxAscii maxWidth strikeLength ascent descent xOffset raster subscript superscript emphasis derivativeFonts pointSize fallbackFont' - instanceVariableNames: 'characterToGlyphMap xTable glyphs name type minAscii maxAscii maxWidth strikeLength ascent descent xOffset raster subscript superscript emphasis derivativeFonts pointSize fallbackFont charIndex' classVariableNames: 'DefaultStringScanner' poolDictionaries: 'TextConstants' category: 'Graphics-Fonts'! !StrikeFont commentStamp: '<historical>' prior: 0! I represent a compact encoding of a set of Forms corresponding to characters in the ASCII character set. All the forms are placed side by side in a large form whose height is the font height, and whose width is the sum of all the character widths. The xTable variable gives the left-x coordinates of the subforms corresponding to the glyphs. Characters are mapped to glyphs by using the characterToGyphMap. Subclasses can have non-trivial mapping rules as well as different representations for glyphs sizes (e.g., not using an xTable). If so, these classes should return nil when queried for xTable and/or the characterToGlyphMap. This will cause the CharacterScanner primitive to fail and query the font for the width of a character (so that a more programatical approach can be implemented). For display, fonts need to implement two messages: #installOn: aDisplayContext foregroundColor: foregroundColor backgroundColor: backgroundColor This method installs the receiver (a font) on the given DisplayContext (which may be an instance of BitBlt or Canvas (or any of it's subclasses). The font should take the appropriate action to initialize the display context so that further display operations can be optimized. #displayString: aString on: aDisplayContext from: startIndex to: stopIndex at: aPoint kern: kernDelta This method is called for each subsequent run of characters in aString which is to be displayed with the (previously installed) settings. ! Item was changed: ----- Method: StrikeFont>>displayMultiString:on:from:to:at:kern:baselineY: (in category 'displaying') ----- displayMultiString: aString on: aBitBlt from: startIndex to: stopIndex at: aPoint kern: kernDelta baselineY: baselineY | leftX rightX glyphInfo char destY form gfont destX destPt | destX := aPoint x. - charIndex := startIndex. glyphInfo := Array new: 5. startIndex to: stopIndex do:[:charIndex| char := aString at: charIndex. (self hasGlyphOf: char) ifTrue: [ self glyphInfoOf: char into: glyphInfo. form := glyphInfo at: 1. leftX := glyphInfo at: 2. rightX := glyphInfo at: 3. destY := glyphInfo at: 4. gfont := glyphInfo at: 5. (gfont == aBitBlt lastFont) ifFalse: [gfont installOn: aBitBlt]. destY := baselineY - destY. aBitBlt displayGlyph: form at: destX @ destY left: leftX right: rightX font: self. destX := destX + (rightX - leftX + kernDelta). ] ifFalse:[ destPt := self fallbackFont displayString: aString on: aBitBlt from: charIndex to: charIndex at: destX @ aPoint y kern: kernDelta from: self baselineY: baselineY. destPt x = destX ifTrue:[ "In some situations BitBlt doesn't return the advance width from the primitive. Work around the situation" destX := destX + (self widthOfString: aString from: charIndex to: charIndex) + kernDelta. ] ifFalse:[destX := destPt x]. ]. ]. ^destX @ aPoint y !

1 0

The Trunk: EToys-nice.78.mcz
by commits＠source.squeak.org 29 Dec '10

29 Dec '10

Nicolas Cellier uploaded a new version of EToys to project The Trunk: http://source.squeak.org/trunk/EToys-nice.78.mcz ==================== Summary ==================== Name: EToys-nice.78 Author: nice Time: 29 December 2010, 3:58:43.772 pm UUID: 2fc3096b-3e18-4f08-8e76-b6c9d43455df Ancestors: EToys-cmm.77 Add a few spaces in order to avoid Transcript warnings about @- ambiguity when recompiling. =============== Diff against EToys-cmm.77 =============== Item was changed: ----- Method: AlignmentMorph>>addUpDownArrowsFor: (in category '*Etoys-initialization') ----- addUpDownArrowsFor: aMorph "Add a column of up and down arrows that serve to send upArrowHit and downArrowHit to aMorph when they're pressed/held down" | holder downArrow upArrow | holder := Morph new extent: 16 @ 16; beTransparent. downArrow := ImageMorph new image: (ScriptingSystem formAtKey: 'DownArrow'). upArrow := ImageMorph new image: (ScriptingSystem formAtKey: 'UpArrow'). + upArrow position: holder bounds topLeft + (2 @ 2). - upArrow position: holder bounds topLeft + (2@2). downArrow align: downArrow bottomLeft + with: holder topLeft + (0 @ TileMorph defaultH) + (2 @ -2). - with: holder topLeft + (0 @ TileMorph defaultH) + (2@-2). holder addMorph: upArrow. holder addMorph: downArrow. self addMorphBack: holder. upArrow on: #mouseDown send: #upArrowHit to: aMorph. upArrow on: #mouseStillDown send: #upArrowHit to: aMorph. downArrow on: #mouseDown send: #downArrowHit to: aMorph. downArrow on: #mouseStillDown send: #downArrowHit to: aMorph.! Item was changed: ----- Method: ScriptEditorMorph>>createThreadShowing (in category 'menu commands') ----- createThreadShowing | vertices | self deleteThreadShowing. vertices := OrderedCollection new. self tileRows do: [:row | | b | row first isTurtleRow ifTrue: [ b := row first bounds. + vertices add: ((b topLeft + (4 @ 0)) + ((0 * 0.1 * b width) @ 0)). - vertices add: ((b topLeft + (4@0)) + ((0 * 0.1 * b width)@0)). 0 to: 9 do: [:i | + vertices add: ((b topLeft + (4 @ 4))+ ((i * 0.1 * b width ) @ 0)). + vertices add: ((b bottomLeft + (4 @ -4)) + ((i * 0.1 * b width) @ 0)). - vertices add: ((b topLeft + (4@4))+ ((i * 0.1 * b width )@0)). - vertices add: ((b bottomLeft + (4@-4)) + ((i * 0.1 * b width)@0)). ]. + vertices add: ((b bottomLeft + (4 @ 0)) + ((9 * 0.1 * b width) @ 0)). - vertices add: ((b bottomLeft + (4@0)) + ((9 * 0.1 * b width)@0)). ] ifFalse: [ b := row first bounds. + vertices add: ((b origin x + b corner x) // 2) @ (b origin y). + vertices add: ((b origin x + b corner x) // 2) @ (b origin y + 4). + vertices add: ((b origin x + b corner x) // 2) @ (b corner y - 4). + vertices add: ((b origin x + b corner x) // 2) @ (b corner y). - vertices add: ((b origin x + b corner x)//2)@(b origin y). - vertices add: ((b origin x + b corner x)//2)@(b origin y + 4). - vertices add: ((b origin x + b corner x)//2)@(b corner y - 4). - vertices add: ((b origin x + b corner x)//2)@(b corner y). ]. ]. threadPolygon := PolygonMorph vertices: vertices color: Color black borderWidth: 2 borderColor: Color black. threadPolygon makeOpen. threadPolygon openInWorld. ! Item was changed: ----- Method: ScriptEditorMorph>>extent: (in category 'other') ----- extent: x | newExtent tw menu | + newExtent := x max: self minWidth @ self minHeight. - newExtent := x max: self minWidth@self minHeight. (tw := self findA: TwoWayScrollPane) ifNil: ["This was the old behavior" ^ super extent: newExtent]. (self hasProperty: #autoFitContents) ifTrue: [ menu := MenuMorph new defaultTarget: self. menu addUpdating: #autoFitString target: self action: #autoFitOnOff. menu addTitle: 'To resize the script, uncheck the box below' translated. menu popUpEvent: nil in: self world . ^ self]. "Allow the user to resize to any size" tw extent: ((newExtent x max: self firstSubmorph width) + @ (newExtent y - self firstSubmorph height)) - (borderWidth * 2) + (-4 @ -4). "inset?" - @ (newExtent y - self firstSubmorph height)) - (borderWidth*2) + (-4@-4). "inset?" ^ super extent: newExtent! Item was changed: ----- Method: ViewerLine>>addGetterFeedback (in category 'slot') ----- addGetterFeedback "Add feedback during mouseover of a getter" | aMorph endMorph | endMorph := (#(touchesA: #seesColor: #overlaps:) includes: self elementSymbol) ifTrue: [submorphs eighth] ifFalse: [submorphs sixth]. + aMorph := RectangleMorph new useRoundedCorners bounds: ((submorphs fourth topLeft - (2 @ -1)) corner: (endMorph bottomRight + (2 @ -1))). - aMorph := RectangleMorph new useRoundedCorners bounds: ((submorphs fourth topLeft - (2@-1)) corner: (endMorph bottomRight + (2@-1))). aMorph beTransparent; borderWidth: 2; borderColor: (Color r: 1.0 g: 0.355 b: 0.839); lock. aMorph setProperty: #highlight toValue: true. ActiveWorld addMorphFront: aMorph " Color fromUser (Color r: 1.0 g: 0.355 b: 0.839) "!

1 0

The Trunk: Compiler-nice.183.mcz
by commits＠source.squeak.org 29 Dec '10

29 Dec '10

Nicolas Cellier uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-nice.183.mcz ==================== Summary ==================== Name: Compiler-nice.183 Author: nice Time: 29 December 2010, 3:54:57.862 pm UUID: 228c16fb-1ba3-407c-84fd-d5722ca2be2f Ancestors: Compiler-ul.182 Cosmetic: rename two shadowing temps in order to avoid warnings in Transcript =============== Diff against Compiler-ul.182 =============== Item was changed: ----- Method: BytecodeEncoder>>blockExtentsToTempsMap (in category 'temps') ----- blockExtentsToTempsMap "Answer a Dictionary of blockExtent to temp locations for the current method. This is used by the debugger to locate temp vars in contexts. A temp map entry is a pair of the temp's name and its index, where an index is either an integer for a normal temp or a pair of the index of the indirect temp vector containing the temp and the index of the temp in its indirect temp vector." | blockExtentsToTempsMap | blockExtentsToLocals ifNil: [^nil]. blockExtentsToTempsMap := Dictionary new. blockExtentsToLocals keysAndValuesDo: [:blockExtent :locals| blockExtentsToTempsMap at: blockExtent put: (Array streamContents: + [:aStream| - [:stream| locals withIndexDo: [:local :index| local isIndirectTempVector ifTrue: [local remoteTemps withIndexDo: + [:remoteLocal :innerIndex| aStream nextPut: { remoteLocal key. { index. innerIndex } }]] + ifFalse: [aStream nextPut: { local key. index }]]])]. - [:remoteLocal :innerIndex| stream nextPut: { remoteLocal key. { index. innerIndex } }]] - ifFalse: [stream nextPut: { local key. index }]]])]. ^blockExtentsToTempsMap! Item was changed: ----- Method: VariableNode>>variableGetterBlockIn: (in category 'tiles') ----- variableGetterBlockIn: aContext + | temps tempIndex ivars | - | temps index ivars | (self type = 4 and: [self key isVariableBinding]) ifTrue: [ ^[self key value] ]. aContext ifNil: [^nil]. self isSelfPseudoVariable ifTrue: [^[aContext receiver]]. self type = 1 ifTrue: [ ivars := aContext receiver class allInstVarNames. + tempIndex := ivars indexOf: self name ifAbsent: [^nil]. + ^[aContext receiver instVarAt: tempIndex] - index := ivars indexOf: self name ifAbsent: [^nil]. - ^[aContext receiver instVarAt: index] ]. self type = 2 ifTrue: [ temps := aContext tempNames. + tempIndex := temps indexOf: self name ifAbsent: [^nil]. + ^[aContext tempAt: tempIndex] - index := temps indexOf: self name ifAbsent: [^nil]. - ^[aContext tempAt: index] ]. ^nil !

1 0

The Trunk: CollectionsTests-nice.178.mcz
by commits＠source.squeak.org 29 Dec '10

29 Dec '10

Nicolas Cellier uploaded a new version of CollectionsTests to project The Trunk: http://source.squeak.org/trunk/CollectionsTests-nice.178.mcz ==================== Summary ==================== Name: CollectionsTests-nice.178 Author: nice Time: 29 December 2010, 3:51:12.599 pm UUID: d84311fa-3a9c-4fa6-b0b4-10927f21f3f1 Ancestors: CollectionsTests-ul.177 Test integer equality with = rather than == =============== Diff against CollectionsTests-ul.177 =============== Item was changed: ----- Method: IntervalTest>>testPermutationsDo (in category 'tests') ----- testPermutationsDo | i oc | i := (1.234 to: 4.234). oc := OrderedCollection new. i permutationsDo: [:e | oc add: e]. + self assert: (oc size = i size factorial). - self assert: (oc size == i size factorial). ^ oc!

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
38
Older →

Jump to page: