Squeak-dev May 2018

squeak-dev@lists.squeakfoundation.org

44 participants
189 discussions

Somebody buy me this ARM mega-desktop machine :-)
by tim Rowledge 07 May '18

07 May '18

Forget the cute but tiny Pi 3B+ running at a mere 1.4GHz with a puny 1Gb RAM. Feast your eyes upon the mighty Cavium ThunderX machine from avantek.co.uk Whilst it is very configurable, a nice basic developer machine with a single 32-core v8 1.6GHz CPU, 32Gb RAM, half-gig SSD, Gb ethernet, FirePro graphics etc is a mere GBP 1850 - call it US$2500. For a comparison that's what ParcPlace paid in 1994 to get me a 70MHz ARM710 workstation with a colossal 4Mb ram. Or of course you could go for the US18000 dual-32-core 2.2GHz etc version, but that's possibly going a bit over the top. The 384-core server model is definitely a bit much :-) Or is it? At a fairly wild guess based on benchmark comparisons for other languages, I suspect each core would probably run Squeak about as fast as a ~2.5Hz intel i7. So, somebody wanting a fast 64-bit ARM VM should really consider the possibilities ... tim -- tim Rowledge; tim(a)rowledge.org; http://www.rowledge.org/tim Oxymorons: Advanced BASIC

3 4

The Trunk: EToys-mt.326.mcz
by commits＠source.squeak.org 06 May '18

06 May '18

Marcel Taeumel uploaded a new version of EToys to project The Trunk: http://source.squeak.org/trunk/EToys-mt.326.mcz ==================== Summary ==================== Name: EToys-mt.326 Author: mt Time: 6 May 2018, 3:18:35.522836 pm UUID: 95d9813d-1659-9b4f-9cc6-d290709bf39a Ancestors: EToys-tpr.325 Supplement to refactoring in Morphic-mt.1427. =============== Diff against EToys-tpr.325 =============== Item was changed: ----- Method: AnonymousSoundMorph>>sound:interimName: (in category 'initialization') ----- sound: aSampledSound interimName: anInterimName "Establish the sound object and an interim name." | aStringMorph | self removeAllMorphs. self hResizing: #shrinkWrap; vResizing: #shrinkWrap. + self borderWidth: 2. - borderWidth := 2. self listDirection: #topToBottom. sound := aSampledSound. interimName := anInterimName. aStringMorph := StringMorph contents: interimName font: ScriptingSystem fontForEToyButtons. self addMorphBack: aStringMorph. self addButtonRow. self balloonTextSelector: #soundMorphHelpString. self setNameTo: interimName! Item was changed: ----- Method: CalendarMorph>>newButtonWithContents: (in category 'building') ----- newButtonWithContents: aByteString ^SimpleButtonMorph new label: aByteString; color: (self color mixed: 0.5 with: Color gray); + borderStyle: (BorderStyle raised width: 2)! - borderColor: #raised; - borderWidth: 2! Item was changed: ----- Method: CalendarMorph>>newDateButtonWithContents: (in category 'building') ----- newDateButtonWithContents: aByteString ^SimpleButtonMorph new label: aByteString; cornerStyle: #square; color: self color muchLighter; + borderStyle: (BorderStyle raised width: 2); - borderColor: #raised; - borderWidth: 2; width: 30! Item was changed: ----- Method: ChessMorph>>addButtonRow (in category 'initialize') ----- addButtonRow | r m | r := AlignmentMorph newRow hResizing: #shrinkWrap; vResizing: #shrinkWrap; color: Color transparent. + r cellInset: 2. r addMorphBack: (self buttonName: ' New ' translated action: #newGame). r addMorphBack: (self buttonName: ' Help ' translated action: #findBestMove). r addMorphBack: (self buttonName: ' Play ' translated action: #thinkAndMove). r addMorphBack: (self buttonName: ' Auto ' translated action: #autoPlay). r addMorphBack: (self buttonName: ' Undo ' translated action: #undoMove). r addMorphBack: (self buttonName: ' Redo ' translated action: #redoMove). r addMorphBack: (self buttonName: ' Quit ' translated action: #delete). r disableTableLayout: true. r align: r bounds topLeft with: self layoutBounds topLeft. self addMorphFront: r. m := UpdatingStringMorph on: self selector: #statusString. m useStringFormat. m disableTableLayout: true. m align: m bounds topLeft with: r fullBounds bottomLeft. self addMorphFront: m.! Item was changed: ----- Method: ChessMorph>>buttonName:action: (in category 'initialize') ----- buttonName: aString action: aSymbol ^ SimpleButtonMorph new target: self; label: aString; actionSelector: aSymbol; color: (Color gray: 0.8); "old color" fillStyle: self buttonFillStyle; + borderWidth: 1; + borderRaised. - borderWidth: 0; - borderColor: #raised. ! Item was changed: ----- Method: ChessMorph>>defaultBorderColor (in category 'initialization') ----- defaultBorderColor + ^ Color transparent! - "answer the default border color/fill style for the receiver" - ^ #raised! Item was added: + ----- Method: ChessMorph>>defaultBorderStyle (in category 'initialization') ----- + defaultBorderStyle + ^ BorderStyle raised! Item was changed: ----- Method: ChessMorph>>initialize (in category 'initialization') ----- initialize "initialize the state of the receiver" super initialize. "" animateMove := false. autoPlay := false. + self cornerStyle: #square. - self cornerStyle: #rounded. self layoutPolicy: TableLayout new. self listDirection: #leftToRight; wrapDirection: #bottomToTop. self addSquares. self addButtonRow. self newGame! Item was changed: ----- Method: CommandTilesMorph>>initialize (in category 'initialization') ----- initialize super initialize. self wrapCentering: #center; cellPositioning: #leftCenter. self hResizing: #shrinkWrap. + self borderWidth: 0. - borderWidth := 0. self layoutInset: 0. self extent: 5@5. "will grow to fit" ! Item was changed: ----- Method: EToyProjectHistoryMorph>>defaultBorderColor (in category 'initialization') ----- defaultBorderColor + ^ Color transparent! - "answer the default border color/fill style for the receiver" - ^ #raised! Item was added: + ----- Method: EToyProjectHistoryMorph>>defaultBorderStyle (in category 'initialization') ----- + defaultBorderStyle + ^ BorderStyle raised! Item was changed: ----- Method: EToyProjectHistoryMorph>>rebuild (in category 'as yet unclassified') ----- rebuild | history r1 | history := ProjectHistory currentHistory mostRecentCopy. changeCounter := ProjectHistory changeCounter. self removeAllMorphs. self rubberBandCells: false. "enable growing" r1 := self addARow: { self inAColumn: { StringMorph new contents: 'Jump...' translated; lock. }. }. r1 on: #mouseUp send: #jumpToProject to: self. history do: [ :each | ( self addARow: { (self inAColumn: { StretchyImageMorph new form: each second; minWidth: 35; minHeight: 35; lock }) vResizing: #spaceFill. self inAColumn: { StringMorph new contents: each first; lock. "StringMorph new contents: each fourth first; lock." }. (self inAColumn: { StringMorph new color: Color red; contents: 'X'; on: #mouseDown send: #confirmedDelete:evt:from: to: self withValue: each fourth first }) hResizing: #rigid. } ) color: Color paleYellow; + borderStyle: (BorderStyle raised width: 1); - borderWidth: 1; - borderColor: #raised; vResizing: #spaceFill; on: #mouseUp send: #mouseUp:in: to: self; on: #mouseDown send: #mouseDown:in: to: self; on: #mouseMove send: #mouseMove:in: to: self; on: #mouseLeave send: #mouseLeave:in: to: self; setProperty: #projectParametersTuple toValue: each; setBalloonText: (each third isEmptyOrNil ifTrue: ['not saved'] ifFalse: [each third]) ]. "--- newTuple := { aProject name. aProject thumbnail. aProject url. WeakArray with: aProject. }. ---"! Item was changed: ----- Method: FishEyeMorph>>extent: (in category 'geometry') ----- extent: aPoint "Round to a number divisible by grid. Note that the superclass has its own implementation." | g gridSize | gridSize := self gridSizeFor: aPoint. "self halt." + g := (aPoint - (2 * self borderWidth)) // gridSize. - g := (aPoint - (2 * borderWidth)) // gridSize. srcExtent := g * gridSize. gridNum := g. ^super extent: self defaultExtent! Item was changed: ----- Method: FreeCell>>buildButton:target:label:selector: (in category 'private') ----- buildButton: aButton target: aTarget label: aLabel selector: aSelector "wrap a button or switch in an alignmentMorph to provide some space around the button" | a | aButton target: aTarget; label: aLabel; actionSelector: aSelector; + borderStyle: (BorderStyle raised width: 2); - borderColor: #raised; - borderWidth: 2; color: Color gray. a := AlignmentMorph newColumn wrapCentering: #center; cellPositioning: #topCenter; hResizing: #shrinkWrap; vResizing: #shrinkWrap; color: Color transparent; layoutInset: 1. a addMorph: aButton. ^ a ! Item was changed: ----- Method: FreeCell>>makeControlBar (in category 'initialization') ----- makeControlBar ^AlignmentMorph newRow color: self colorNearBottom; + borderStyle: (BorderStyle inset width: 2); - borderColor: #inset; - borderWidth: 2; layoutInset: 0; hResizing: #spaceFill; vResizing: #shrinkWrap; wrapCentering: #center; cellPositioning: #leftCenter; yourself.! Item was changed: ----- Method: FreeCellStatistics>>buildButton:target:label:selector: (in category 'user interface') ----- buildButton: aButton target: aTarget label: aLabel selector: aSelector "wrap a button or switch in an alignmentMorph to provide some space around the button" | a | aButton target: aTarget; label: aLabel; actionSelector: aSelector; + borderStyle: (BorderStyle raised width: 2); - borderColor: #raised; - borderWidth: 2; color: Color gray. a := AlignmentMorph newColumn wrapCentering: #center; cellPositioning: #topCenter; hResizing: #spaceFill; vResizing: #shrinkWrap; color: Color transparent; layoutInset: 1. a addMorph: aButton. ^ a ! Item was changed: ----- Method: FreeCellStatistics>>makeControls (in category 'user interface') ----- makeControls | row | row := AlignmentMorph newRow. row wrapCentering: #center; cellPositioning: #leftCenter; hResizing: #spaceFill; vResizing: #shrinkWrap; color: self color; + borderStyle: (BorderStyle inset width: 2); - borderWidth: 2; - borderColor: #inset; addMorphBack: self makeOkButton; addMorphBack: self makeResetButton. ^row.! Item was changed: ----- Method: FreeCellStatistics>>makeStatistics (in category 'user interface') ----- makeStatistics | row | row := AlignmentMorph newRow. row wrapCentering: #center; cellPositioning: #leftCenter; hResizing: #spaceFill; vResizing: #spaceFill; color: self color; + borderStyle: (BorderStyle inset width: 2); - borderWidth: 2; - borderColor: #inset; addMorphBack: (AlignmentMorph newColumn wrapCentering: #center; cellPositioning: #topCenter; color: self color; addMorph: (statsMorph := TextMorph new contents: self statsText)). ^row.! Item was changed: ----- Method: HTTPProxyEditor>>updateWidgets (in category 'initialization') ----- updateWidgets "update the receiver's widgets" acceptWidget isNil ifFalse: ["" acceptWidget color: Color lightGreen; + borderStyle: (BorderStyle raised width: 2)]. - borderWidth: 2; - borderColor: #raised]. cancelWidget isNil ifFalse: ["" cancelWidget color: Color lightRed; + borderStyle: (BorderStyle raised width: 2)]. - borderWidth: 2; - borderColor: #raised]. "" serverNameLabelWidget isNil ifFalse: ["" serverNameLabelWidget color: self paneColor lighter; + borderStyle: (BorderStyle raised width: serverNameLabelWidget borderWidth)]. - borderColor: #raised]. portLabelWidget isNil ifFalse: ["" portLabelWidget color: self paneColor lighter; + borderStyle: (BorderStyle raised width: portLabelWidget borderWidth)]! - borderColor: #raised]! Item was changed: ----- Method: IconicButtonWithLabel>>labelGraphic:color:andLabel: (in category 'as yet unclassified') ----- labelGraphic: aForm color: nonTranslucent andLabel: aStringMorph | graphicalMorph labeledItem actualForm | labeledItem := AlignmentMorph newColumn. labeledItem hResizing: #shrinkWrap. labeledItem vResizing: #shrinkWrap. labeledItem color: nonTranslucent. labeledItem borderWidth: 0. labeledItem layoutInset: 4@0; cellPositioning: #center. self removeAllMorphs. actualForm := (Form extent: aForm extent depth: 32) fillColor: nonTranslucent. aForm displayOn: actualForm at: 0@0 rule: 34. graphicalMorph := SketchMorph withForm: actualForm. labeledItem addMorph: graphicalMorph. labeledItem addMorphBack: (Morph new extent: (4@4)) beTransparent. aStringMorph ifNotNil: [ labeledItem addMorphBack: aStringMorph ]. self addMorph: labeledItem. + self extent: submorphs first fullBounds extent + (self borderWidth + 6). - self extent: submorphs first fullBounds extent + (borderWidth + 6). labeledItem lock. ! Item was changed: ----- Method: IconicButtonWithLabel>>labelString: (in category 'as yet unclassified') ----- labelString: aString labelMorph ifNotNil: [ labelMorph contents: aString. + self extent: self firstSubmorph fullBounds extent + (self borderWidth + 6). - self extent: submorphs first fullBounds extent + (borderWidth + 6). ]. ! Item was changed: ----- Method: MidiInputMorph>>addChannelControlsFor: (in category 'as yet unclassified') ----- addChannelControlsFor: channelIndex | r divider col | r := self makeRow hResizing: #shrinkWrap; vResizing: #shrinkWrap. r addMorphBack: (self channelNumAndMuteButtonFor: channelIndex). r addMorphBack: (Morph new extent: 10@5; color: color). "spacer" r addMorphBack: (self panAndVolControlsFor: channelIndex). divider := AlignmentMorph new extent: 10@1; - borderWidth: 1; layoutInset: 0; + borderStyle: (BorderStyle raised width: 1); - borderColor: #raised; color: color; hResizing: #spaceFill; vResizing: #rigid. col := self lastSubmorph. col addMorphBack: divider. col addMorphBack: r. ! Item was changed: ----- Method: MidiInputMorph>>makeControls (in category 'as yet unclassified') ----- makeControls | bb r reverbSwitch onOffSwitch | bb := SimpleButtonMorph new target: self; + borderStyle: (BorderStyle raised width: 2); - borderColor: #raised; - borderWidth: 2; color: color. r := AlignmentMorph newRow. r color: bb color; borderWidth: 0; layoutInset: 0. r hResizing: #shrinkWrap; vResizing: #shrinkWrap; extent: 5@5. r addMorphBack: ( bb label: '<>'; actWhen: #buttonDown; actionSelector: #invokeMenu). onOffSwitch := SimpleSwitchMorph new offColor: color; onColor: (Color r: 1.0 g: 0.6 b: 0.6); borderWidth: 2; label: 'On'; actionSelector: #toggleOnOff; target: self; setSwitchState: false. r addMorphBack: onOffSwitch. reverbSwitch := SimpleSwitchMorph new offColor: color; onColor: (Color r: 1.0 g: 0.6 b: 0.6); borderWidth: 2; label: 'Reverb Disable'; actionSelector: #disableReverb:; target: self; setSwitchState: SoundPlayer isReverbOn not. r addMorphBack: reverbSwitch. ^ r ! Item was changed: ----- Method: Mines>>buildButton:target:label:selector: (in category 'initialize') ----- buildButton: aButton target: aTarget label: aLabel selector: aSelector "wrap a button or switch in an alignmentMorph to allow a row of buttons to fill space" | a | aButton target: aTarget; label: aLabel; actionSelector: aSelector; + borderStyle: (BorderStyle raised width: 2); - borderColor: #raised; - borderWidth: 2; color: color. a := AlignmentMorph newColumn wrapCentering: #center; cellPositioning: #topCenter; hResizing: #spaceFill; vResizing: #shrinkWrap; color: color. a addMorph: aButton. ^ a ! Item was changed: ----- Method: Mines>>defaultBorderColor (in category 'initialization') ----- defaultBorderColor + ^ Color transparent! - "answer the default border color/fill style for the receiver" - ^ #raised! Item was added: + ----- Method: Mines>>defaultBorderStyle (in category 'initialization') ----- + defaultBorderStyle + ^ BorderStyle raised! Item was changed: ----- Method: Mines>>makeControls (in category 'initialize') ----- makeControls | row | row := AlignmentMorph newRow color: color; borderWidth: 2; layoutInset: 3. + row borderStyle: BorderStyle inset. - row borderColor: #inset. row hResizing: #spaceFill; vResizing: #shrinkWrap; wrapCentering: #center; cellPositioning: #leftCenter; extent: 5 @ 5. row addMorph: (self buildButton: SimpleSwitchMorph new target: self label: ' Help ' translated selector: #help:). row addMorph: (self buildButton: SimpleButtonMorph new target: self label: ' Quit ' translated selector: #delete). "row addMorph: (self buildButton: SimpleButtonMorph new target: self label: ' Hint ' translated selector: #hint)." row addMorph: (self buildButton: SimpleButtonMorph new target: self label: ' New game ' translated selector: #newGame). minesDisplay := LedMorph new digits: 2; extent: 2 * 10 @ 15. row addMorph: (self wrapPanel: minesDisplay label: 'Mines:' translated). timeDisplay := LedTimerMorph new digits: 3; extent: 3 * 10 @ 15. row addMorph: (self wrapPanel: timeDisplay label: 'Time:' translated). ^ row! Item was changed: ----- Method: MinesBoard>>defaultBorderColor (in category 'initialization') ----- defaultBorderColor + ^ Color transparent! - "answer the default border color/fill style for the receiver" - ^ #inset! Item was added: + ----- Method: MinesBoard>>defaultBorderStyle (in category 'initialization') ----- + defaultBorderStyle + ^ BorderStyle inset! Item was changed: ----- Method: MinesTile>>drawOn: (in category 'drawing') ----- drawOn: aCanvas "Draw a rectangle with a solid, inset, or raised border. Note: the raised border color *and* the inset border color are generated from the receiver's own color, instead of having the inset border color generated from the owner's color, as in BorderedMorph." | font rct | + super drawOn: aCanvas. + + self borderStyle style == #inset ifTrue: [ - - borderWidth = 0 ifTrue: [ "no border" - aCanvas fillRectangle: bounds color: color. - ^ self.]. - - borderColor == #raised ifTrue: [ - ^ aCanvas frameAndFillRectangle: bounds - fillColor: color - borderWidth: borderWidth - topLeftColor: color lighter lighter - bottomRightColor: color darker darker darker]. - - borderColor == #inset ifTrue: [ - aCanvas frameAndFillRectangle: bounds - fillColor: color - borderWidth: 1 " borderWidth" - topLeftColor: (color darker darker darker) - bottomRightColor: color lighter. self isMine ifTrue: [ font := StrikeFont familyName: 'Atlanta' size: 22 emphasized: 1. + rct := self bounds insetBy: ((self bounds width) - (font widthOfString: '*'))/2@0. - rct := bounds insetBy: ((bounds width) - (font widthOfString: '*'))/2@0. rct := rct top: rct top + 1. aCanvas drawString: '*' in: (rct translateBy: 1@1) font: font color: Color black. ^ aCanvas drawString: '*' in: rct font: font color: Color red .]. self nearMines > 0 ifTrue: [ font := StrikeFont familyName: 'ComicBold' size: 22 emphasized: 1. + rct := self bounds insetBy: ((self bounds width) - (font widthOfString: nearMines asString))/2@0. - rct := bounds insetBy: ((bounds width) - (font widthOfString: nearMines asString))/2@0. rct := rct top: rct top + 1. aCanvas drawString: nearMines asString in: (rct translateBy: 1@1) font: font color: Color black. + ^ aCanvas drawString: nearMines asString in: rct font: font color: ((palette at: nearMines) ) .]].! - ^ aCanvas drawString: nearMines asString in: rct font: font color: ((palette at: nearMines) ) .]. - ^self. ]. - - "solid color border" - aCanvas frameAndFillRectangle: bounds - fillColor: color - borderWidth: borderWidth - borderColor: borderColor.! Item was changed: ----- Method: MinesTile>>switchState: (in category 'accessing') ----- switchState: aBoolean switchState := aBoolean. disabled ifFalse: [switchState ifTrue:[ "flag ifTrue: [self setFlag]." "if this is a flagged tile, unflag it." + self borderStyle: (BorderStyle inset width: 1). - self borderColor: #inset. self color: onColor] ifFalse:[ + self borderStyle: (BorderStyle raised width: 3). - self borderColor: #raised. self color: offColor]]! Item was changed: ----- Method: NewVariableDialogMorph>>buildDecimalPlacesButton (in category 'build') ----- buildDecimalPlacesButton | button | button := SimpleButtonMorph new labelString: self decimalPlaces asString font: Preferences standardEToysButtonFont; color: (Color r: 0.806 g: 1.0 b: 0.645); target: self; actionSelector: #chooseDecimalPlaces; extent: 200 @ (TextStyle defaultFont height + 10); cornerStyle: #square; + borderStyle: BorderStyle raised; - borderColor: #raised; yourself. self addArrowsOn: button. ^ button ! Item was changed: ----- Method: NewVariableDialogMorph>>buildVarTypeButton (in category 'build') ----- buildVarTypeButton | button | button := SimpleButtonMorph new labelString: self varType translated font: Preferences standardEToysButtonFont; color: (Color r: 0.806 g: 1.0 b: 0.645); target: self; actionSelector: #chooseType; extent: 200 @ (TextStyle defaultFont height + 10); cornerStyle: #square; + borderStyle: BorderStyle raised; - borderColor: #raised; yourself. self addArrowsOn: button. ^ button ! Item was changed: ----- Method: PDAClockMorph>>drawOn: (in category 'drawing') ----- drawOn: aCanvas + aCanvas frameAndFillRectangle: self bounds fillColor: backgroundColor + borderWidth: self borderWidth borderColor: self borderColor. - aCanvas frameAndFillRectangle: bounds fillColor: backgroundColor - borderWidth: 1 borderColor: borderColor. super drawOn: aCanvas. ! Item was changed: ----- Method: PlayingCardDeck>>initialize (in category 'initialization') ----- initialize super initialize. self cellPositioning: #topLeft. self reverseTableCells: true. self layout: #grid. self hResizing: #shrinkWrap. self vResizing: #shrinkWrap. + self borderWidth: 0. - borderWidth := 0. self layoutInset: 0. stackingPolicy := #stagger. stackingOrder := #ascending. emptyDropPolicy := #any. self newSeed. ^self! Item was changed: ----- Method: RecordingControls>>initialize (in category 'initialization') ----- initialize "Initialize the receiver." | r full | super initialize. self hResizing: #shrinkWrap; vResizing: #shrinkWrap. + self borderWidth: 2. - borderWidth := 2. self listDirection: #topToBottom. recorder := SoundRecorder new. recordingSaved := false. full := self addButtonRows. self changeCodec: OggSpeexCodec name: 'Speex'. "self addRecordLevelSliderIn: full." "Doesn't work in most or maybe even all platforms..." r := AlignmentMorph newRow vResizing: #shrinkWrap. r addMorphBack: (self makeRecordMeterIn: full). self addMorphBack: r. self extent: 10@10. "make minimum size" self setButtonEnablement ! Item was changed: ----- Method: RulerMorph>>drawOn: (in category 'drawing') ----- drawOn: aCanvas | s | super drawOn: aCanvas. s := self width printString, 'x', self height printString. + aCanvas drawString: s in: (self bounds insetBy: self borderWidth + 5) font: nil color: Color red. - aCanvas drawString: s in: (bounds insetBy: borderWidth + 5) font: nil color: Color red. ! Item was changed: ----- Method: SameGame>>buildButton:target:label:selector: (in category 'initialization') ----- buildButton: aButton target: aTarget label: aLabel selector: aSelector "wrap a button or switch in an alignmentMorph to allow a row of buttons to fill space" | a | aButton target: aTarget; label: aLabel; actionSelector: aSelector; + borderStyle: (BorderStyle raised width: 2); - borderColor: #raised; - borderWidth: 2; color: color. a := AlignmentMorph newColumn wrapCentering: #center; cellPositioning: #topCenter; hResizing: #spaceFill; vResizing: #shrinkWrap; color: color. a addMorph: aButton. ^ a ! Item was changed: ----- Method: SameGameTile>>setSwitchState: (in category 'accessing') ----- setSwitchState: aBoolean switchState := aBoolean. disabled ifFalse: [switchState ifTrue: + [self borderInset. - [self borderColor: #inset. self color: onColor] ifFalse: + [self borderRaised. - [self borderColor: #raised. self color: offColor]]! Item was changed: ----- Method: ScriptEditorMorph>>extent: (in category 'other') ----- extent: x | newExtent tw menu | 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)) - (self borderWidth * 2) + (-4 @ -4). "inset?" - @ (newExtent y - self firstSubmorph height)) - (borderWidth * 2) + (-4 @ -4). "inset?" ^ super extent: newExtent! Item was changed: ----- Method: ScriptableButton>>label: (in category 'accessing') ----- label: aString "Set the receiver's label as indicated" | aLabel | (aLabel := self findA: StringMorph) ifNotNil: [aLabel contents: aString] ifNil: [aLabel := StringMorph contents: aString font: Preferences standardEToysButtonFont. self addMorph: aLabel]. + self extent: aLabel extent + (self borderWidth + 6). - self extent: aLabel extent + (borderWidth + 6). aLabel position: self center - (aLabel extent // 2). aLabel lock! Item was changed: ----- Method: StackMorph>>formatList: (in category 'menu') ----- formatList: pl | rr ff | "Turn this plugglable list into a good looking morph." pl color: Color transparent; borderWidth: 0. pl font: ((TextStyle named: #Palatino) fontOfSize: 14). pl toggleCornerRounding; width: 252; retractableOrNot; hResizing: #spaceFill. rr := (RectangleMorph new) toggleCornerRounding; extent: pl extent + (30@30). rr color: self currentPage color; fillStyle: (ff := self currentPage fillStyle copy). ff isGradientFill ifTrue: [ rr fillStyle direction: (ff direction * self currentPage extent / rr extent) rounded. rr fillStyle origin: rr bounds origin]. rr addMorph: pl. rr layoutPolicy: TableLayout new. rr layoutInset: 10@15; cellInset: 10@15; wrapDirection: #leftToRight. + rr listCentering: #center; borderStyle: (BorderStyle raised width: 5). - rr listCentering: #center; borderWidth: 5; borderColor: #raised. "Up and down buttons on left with arrows in a holder." "lb := (RectangleMorph new) color: transparent; borderWidth: 0." ^ rr! Item was changed: ----- Method: StandardViewer>>addHeaderMorphWithBarHeight:includeDismissButton: (in category 'initialization') ----- addHeaderMorphWithBarHeight: anInteger includeDismissButton: aBoolean "Add the header morph to the receiver, using anInteger as a guide for its height, and if aBoolean is true, include a dismiss buton for it" | header aButton aTextMorph nail wrpr costs headWrapper | header := AlignmentMorph newRow color: Color transparent; wrapCentering: #center; cellPositioning: #leftCenter. aBoolean ifTrue: [aButton := self tanOButton. header addMorph: aButton. aButton actionSelector: #dismiss; setBalloonText: 'remove this entire Viewer from the screen don''t worry -- nothing will be lost!!.' translated. header addTransparentSpacerOfSize: 3]. costs := scriptedPlayer costumes. costs ifNotNil: [(costs size > 1 or: [costs size = 1 and: [costs first ~~ scriptedPlayer costume]]) ifTrue: [header addUpDownArrowsFor: self. "addArrowsOn: adds the box with two arrow at the front." (wrpr := header submorphs first) submorphs second setBalloonText: 'switch to previous costume' translated. wrpr submorphs first setBalloonText: 'switch to next costume' translated]. header addTransparentSpacerOfSize: 3]. self viewsMorph ifTrue: [scriptedPlayer costume assureExternalName]. aTextMorph := UpdatingStringMorph new useStringFormat; target: scriptedPlayer; getSelector: #nameForViewer; setNameTo: 'name'; font: ScriptingSystem fontForNameEditingInScriptor. self viewsMorph ifTrue: [aTextMorph putSelector: #setName:. aTextMorph setProperty: #okToTextEdit toValue: true]. aTextMorph step. header addMorphBack: aTextMorph. aTextMorph setBalloonText: 'Click here to edit the player''s name.' translated. header addMorphBack: ((self transparentSpacerOfSize: 0) hResizing: #spaceFill; color: Color red). aButton := ThreePhaseButtonMorph labelSymbol: #AddInstanceVariable target: scriptedPlayer actionSelector: #addInstanceVariable arguments: #(). aButton setBalloonText: 'click here to add a variable to this object.' translated. header addMorphBack: aButton. header addTransparentSpacerOfSize: 3. nail := (self hasProperty: #noInteriorThumbnail) ifFalse: [ThumbnailMorph new objectToView: scriptedPlayer viewSelector: #costume] ifTrue: [ImageMorph new image: (ScriptingSystem formAtKey: #MenuIcon)]. nail on: #mouseDown send: #offerViewerMenuForEvt:morph: to: scriptedPlayer. header addMorphBack: nail. nail setBalloonText: 'click here to get a menu that will allow you to locate this object, tear off a tile, etc..' translated. (self hasProperty: #noInteriorThumbnail) ifFalse: + [nail borderStyle: (BorderStyle raised width: 3)]. - [nail borderWidth: 3; borderColor: #raised]. header addTransparentSpacerOfSize: 3. aButton := ThreePhaseButtonMorph labelSymbol: #AddCategoryViewer. aButton actWhen: #buttonUp; target: self; actionSelector: #addCategoryViewer; setBalloonText: 'click here to add another category pane' translated. header addMorphBack: aButton. header beSticky. anInteger > 0 ifTrue: [headWrapper := AlignmentMorph newColumn color: self color. headWrapper addTransparentSpacerOfSize: (0 @ anInteger). headWrapper addMorphBack: header. self addMorph: headWrapper] ifFalse: [self addMorph: header]! Item was changed: ----- Method: SyntaxMorph>>borderColor: (in category 'accessing') ----- borderColor: colorOrSymbolOrNil + self borderColor = colorOrSymbolOrNil ifFalse: [ + super borderColor: colorOrSymbolOrNil. - borderColor = colorOrSymbolOrNil ifFalse: [ - borderColor := colorOrSymbolOrNil. self bounds area < 40000 ifTrue: [self invalidRect: self bounds] ifFalse: [(self bounds areasOutside: (self bounds insetBy: self borderWidth)) do: [:r | self invalidRect: r]]]. ! Item was changed: ----- Method: SyntaxMorph>>select (in category 'selection') ----- select self deselect. "Outer block is not colored and has no popup" (owner isSyntaxMorph and: [owner nodeClassIs: MethodNode]) ifTrue: [self setDeselectedColor "normal"] ifFalse: [self color: Color lightBrown]. + self borderStyle: (BorderStyle raised width: self borderWidth). - self borderColor: #raised. self offerPopUp.! Item was changed: ----- Method: SyntaxMorph>>trackDropZones (in category 'insertion drop zones') ----- trackDropZones | hand i localPt insertion insHt ii prevBot nxtHt d c1 c2 ht2 spacer1 spacer2 wid ht1 dc each | hand := self primaryHand. ("hand lastEvent redButtonPressed &" hand hasSubmorphs and: [(self hasOwner: hand) not]) ifFalse: [^ self]. insertion := hand firstSubmorph renderedMorph. insertion isSyntaxMorph ifFalse: [^ self]. insertion isNoun ifFalse: [(insertion nodeClassIs: CommentNode) ifFalse: [^ self]]. localPt := self globalPointToLocal: hand position. insHt := insertion height. "**just use standard line height here" self removeDropZones. "Maybe first check if in right place, then just tweak heights." i := (ii := self indexOfMorphAbove: localPt) min: submorphs size-1. prevBot := i <= 0 ifTrue: [(self innerBounds) top] ifFalse: [(self submorphs at: i) bottom]. nxtHt := (submorphs isEmpty ifTrue: [insertion] ifFalse: [self submorphs at: i+1]) height. d := ii > i ifTrue: [nxtHt "for consistent behavior at bottom"] ifFalse: [0 max: (localPt y - prevBot min: nxtHt)]. "Top and bottom spacer heights cause continuous motion..." c1 := Color transparent. c2 := Color transparent. ht2 := d*insHt//nxtHt. ht1 := insHt - ht2. + wid := self width - (2*self borderWidth) - (2*self layoutInset). - wid := self width - (2*borderWidth) - (2*self layoutInset). wid isPoint ifTrue: [wid := wid x]. (spacer1 := BorderedMorph newBounds: (0@0 extent: wid@ht1) color: (ht1 > (insHt//2) ifTrue: [c1] ifFalse: [c2])) borderWidth: 1; borderColor: spacer1 color. self privateAddMorph: spacer1 atIndex: (i+1 max: 1). (spacer2 := BorderedMorph newBounds: (0@0 extent: wid@ht2) color: (ht2 > (insHt//2+1) ifTrue: [c1] ifFalse: [c2])) borderWidth: 1; borderColor: spacer2 color. spacer1 setProperty: #dropZone toValue: true. spacer2 setProperty: #dropZone toValue: true. self privateAddMorph: spacer2 atIndex: (i+3 min: submorphs size+1). self fullBounds. "Force layout prior to testing for cursor containment" "Maintain the drop target highlight -- highlight spacer if hand is in it." {spacer1. spacer2} do: [:spacer | (spacer containsPoint: localPt) ifTrue: [spacer color: self dropColor. "Ignore border color. Maybe do it later. self borderColor = self dropColor ifTrue: [self borderColor: self stdBorderColor]"]]. "If no submorph (incl spacers) highlighted, then re-highlight the block." "Ignore border color. Maybe do it later. ((self wantsDroppedMorph: insertion event: hand lastEvent) and: [(self submorphs anySatisfy: [:m | m containsPoint: localPt]) not]) ifTrue: [self borderColor: self dropColor]. " "Dragging a tile within a Block, if beside a tile, color it a dropzone" "Transcript show: localPt y printString; space; show: submorphs first top printString; space; show: submorphs last top printString; cr." dc := self dropColor. 1 to: ((ii+4 min: submorphs size) max: 1) do: [:ind | each := submorphs at: ind. each isSyntaxMorph ifTrue: [ localPt y >= each top ifTrue: ["in this one or beyond" (localPt y < each bottom) ifTrue: [(each submorphs anySatisfy: [:m | m containsPoint: localPt]) ifTrue: [each setDeselectedColor] ifFalse: [each color: dc]] ifFalse: [each color = dc ifTrue: [each setDeselectedColor]]] ifFalse: [each color = dc ifTrue: [each setDeselectedColor]]]]. ! Item was changed: ----- Method: SyntaxMorph>>unhighlight (in category 'highlighting') ----- unhighlight + self setDeselectedColor.! - self setDeselectedColor. - - - false ifTrue: [ - self currentSelectionDo: [:innerMorph :mouseDownLoc :outerMorph | - self color: ( false - "(self == outerMorph or: [owner notNil and: [owner isSyntaxMorph not]])" - ifTrue: [self valueOfProperty: #deselectedBorderColor ifAbsent: [#raised]] - ifFalse: [self color: Color transparent] - ) - ]]. - ! Item was changed: ----- Method: SyntaxMorph>>unhighlightBorder (in category 'highlighting') ----- unhighlightBorder self currentSelectionDo: [:innerMorph :mouseDownLoc :outerMorph | self borderColor: ( (self == outerMorph or: [owner notNil and: [owner isSyntaxMorph not]]) + ifFalse: [self borderColor: self stdBorderColor] + ifTrue: [ + (self hasProperty: #deselectedBorderColor) + ifTrue: [self borderColor: (self valueOfProperty: #deselectedBorderColor)] + ifFalse: [self borderStyle: (BorderStyle raised width: self borderWidth)]] )].! - ifTrue: [self valueOfProperty: #deselectedBorderColor ifAbsent: [#raised]] - ifFalse: [self stdBorderColor] - ) - ] - ! Item was changed: ----- Method: Tetris>>buildButtonTarget:label:selector:help: (in category 'initialization') ----- buildButtonTarget: aTarget label: aLabel selector: aSelector help: aString ^self rowForButtons addMorph: ( SimpleButtonMorph new target: aTarget; label: aLabel; actionSelector: aSelector; + borderStyle: (BorderStyle raised width: 2); - borderColor: #raised; - borderWidth: 2; color: color ) ! Item was changed: ----- Method: TileMorph>>typeColor: (in category 'misc') ----- typeColor: aColor "Set the receiver's typeColor" + self borderColor: ScriptingSystem standardTileBorderColor. + - borderColor := ScriptingSystem standardTileBorderColor. typeColor := aColor. color := ScriptingSystem uniformTileInteriorColor ! Item was changed: ----- Method: WatchMorph>>drawOn: (in category 'drawing') ----- drawOn: aCanvas "Draw the watch on the given canvas" | pHour pMin pSec time centerColor | time := Time now. pHour := self radius: 0.6 hourAngle: time hours + (time minutes/60.0). pMin := self radius: 0.72 hourAngle: (time minutes / 5.0). pSec := self radius: 0.8 hourAngle: (time seconds / 5.0). centerColor := cColor ifNil: [Color transparent] ifNotNil: [time hours < 12 ifTrue: [cColor muchLighter] ifFalse: [cColor]]. antialias ifTrue: [aCanvas asBalloonCanvas aaLevel: 4; + drawOval: (self bounds insetBy: self borderWidth // 2 + 1) color: self fillStyle + borderWidth: self borderWidth borderColor: self borderColor; + drawOval: (self bounds insetBy: self extent*0.35) color: centerColor - drawOval: (bounds insetBy: borderWidth // 2 + 1) color: self fillStyle - borderWidth: borderWidth borderColor: borderColor; - drawOval: (bounds insetBy: self extent*0.35) color: centerColor borderWidth: 0 borderColor: Color black; drawPolygon: {self center. pHour} color: Color transparent borderWidth: 3 borderColor: handsColor; drawPolygon: {self center. pMin} color: Color transparent borderWidth: 2 borderColor: handsColor; drawPolygon: {self center. pSec} color: Color transparent borderWidth: 1 borderColor: handsColor] ifFalse: [super drawOn: aCanvas. aCanvas + fillOval: (self bounds insetBy: self extent*0.35) color: centerColor; - fillOval: (bounds insetBy: self extent*0.35) color: centerColor; line: self center to: pHour width: 3 color: handsColor; line: self center to: pMin width: 2 color: handsColor; line: self center to: pSec width: 1 color: handsColor] !

1 0

The Trunk: Nebraska-mt.53.mcz
by commits＠source.squeak.org 06 May '18

06 May '18

Marcel Taeumel uploaded a new version of Nebraska to project The Trunk: http://source.squeak.org/trunk/Nebraska-mt.53.mcz ==================== Summary ==================== Name: Nebraska-mt.53 Author: mt Time: 6 May 2018, 3:16:38.375836 pm UUID: bef0ab6e-41e7-b340-a9e7-719d3a60c412 Ancestors: Nebraska-ul.52 Supplement to refactoring in Morphic-mt.1427. =============== Diff against Nebraska-ul.52 =============== Item was changed: ----- Method: NebraskaCommunicatorMorph>>addGateKeeperMorphs (in category 'collaborative') ----- addGateKeeperMorphs | list currentTime choices | self setProperty: #gateKeeperCounterValue toValue: NebraskaGateKeeperMorph updateCounter. choices := #( (60 'm' 'in the last minute') (3600 'h' 'in the last hour') (86400 'd' 'in the last day') ). currentTime := Time totalSeconds. list := NebraskaGateKeeperMorph knownIPAddresses. list do: [ :each | | age row | age := each timeBetweenLastAccessAnd: currentTime. age := choices detect: [ :x | age <= x first] ifNone: [{0. '-'. (age // 86400) printString,'days ago'}]. row := self addARow: (NebraskaIncomingMessage allTypes collect: [ :type | self toggleButtonFor: each attribute: type] ), { (self inAColumn: { (StringMorph contents: age second) lock. }) layoutInset: 2; hResizing: #shrinkWrap; setBalloonText: 'Last attempt was ',age third. (self inAColumn: { (StringMorph contents: each ipAddress) lock. }) layoutInset: 2; hResizing: #shrinkWrap. (self inAColumn: { (StringMorph contents: each latestUserName) lock. }) layoutInset: 2. }. row color: (Color r: 0.6 g: 0.8 b: 1.0); + borderStyle: (BorderStyle raised width: 1); - borderWidth: 1; - borderColor: #raised; vResizing: #spaceFill; "on: #mouseUp send: #mouseUp:in: to: self;" setBalloonText: each fullInfoString ].! Item was changed: ----- Method: NebraskaFridgeMorph>>defaultBorderColor (in category 'initialization') ----- defaultBorderColor + ^ Color transparent! - "answer the default border color/fill style for the receiver" - ^ #raised! Item was added: + ----- Method: NebraskaFridgeMorph>>defaultBorderStyle (in category 'initialization') ----- + defaultBorderStyle + ^ BorderStyle raised! Item was changed: ----- Method: NebraskaFridgeMorph>>rebuild (in category 'as yet unclassified') ----- rebuild | row filler fudge people maxPerRow insetY | updateCounter := self class updateCounter. self removeAllMorphs. (self addARow: { filler := Morph new color: Color transparent; extent: 4@4. }) vResizing: #shrinkWrap. self addARow: { (StringMorph contents: 'the Fridge' translated) lock. self groupToggleButton. }. row := self addARow: {}. people := self class fridgeRecipients. maxPerRow := people size < 7 ifTrue: [2] ifFalse: [3]. "how big can this get before we need a different approach?" people do: [ :each | row submorphCount >= maxPerRow ifTrue: [row := self addARow: {}]. row addMorphBack: ( groupMode ifTrue: [ (each userPicture scaledToSize: 35@35) asMorph lock ] ifFalse: [ each veryDeepCopy killExistingChat ] ) ]. fullBounds := nil. self fullBounds. "htsBefore := submorphs collect: [ :each | each height]." fudge := 20. insetY := self layoutInset. insetY isPoint ifTrue: [insetY := insetY y]. filler extent: + 4 @ (self height - filler height * 0.37 - insetY - self borderWidth - fudge) truncated. - 4 @ (self height - filler height * 0.37 - insetY - borderWidth - fudge) truncated. "self fixLayout. htsAfter := submorphs collect: [ :each | each height]. {htsBefore. htsAfter} explore." ! Item was changed: ----- Method: NebraskaGateKeeperMorph>>defaultBorderColor (in category 'initialization') ----- defaultBorderColor + ^ Color transparent! - "answer the default border color/fill style for the receiver" - ^ #raised! Item was added: + ----- Method: NebraskaGateKeeperMorph>>defaultBorderStyle (in category 'initialization') ----- + defaultBorderStyle + ^ BorderStyle raised! Item was changed: ----- Method: NebraskaServerMorph>>setColorsAndBorder (in category 'initialization') ----- setColorsAndBorder | worldColor c | c := ((Preferences menuColorFromWorld and: [Display depth > 4]) and: [(worldColor := self currentWorld color) isColor]) ifTrue: [worldColor luminance > 0.7 ifTrue: [worldColor mixed: 0.8 with: Color black] ifFalse: [worldColor mixed: 0.4 with: Color white]] ifFalse: [Color r: 0.9 g: 0.9 b: 0.9]. self color: c. + self borderStyle: (BorderStyle raised width: 1). - self borderColor: #raised. - self borderWidth: 1. self useRoundedCorners!

1 0

The Trunk: GetText-mt.48.mcz
by commits＠source.squeak.org 06 May '18

06 May '18

Marcel Taeumel uploaded a new version of GetText to project The Trunk: http://source.squeak.org/trunk/GetText-mt.48.mcz ==================== Summary ==================== Name: GetText-mt.48 Author: mt Time: 6 May 2018, 3:15:57.943836 pm UUID: 80850592-5b4d-044f-8245-3f060b7766fc Ancestors: GetText-topa.47 Supplement to refactoring in Morphic-mt.1427. =============== Diff against GetText-topa.47 =============== Item was changed: ----- Method: LanguageEditor>>createButtonLabel:action:help: (in category 'initialization - toolbar') ----- createButtonLabel: aString action: actionSelector help: helpString "create a toolbar for the receiver" | button | button := SimpleButtonMorph new target: self; label: aString translated "font: Preferences standardButtonFont"; actionSelector: actionSelector; setBalloonText: helpString translated; color: translator defaultBackgroundColor twiceDarker; + borderStyle: (BorderStyle raised width: 2). - borderWidth: 2; - borderColor: #raised. "" ^ button! Item was changed: ----- Method: LanguageEditor>>createUpdatingButtonWording:action:help: (in category 'initialization - toolbar') ----- createUpdatingButtonWording: wordingSelector action: actionSelector help: helpString "create a toolbar for the receiver" | button | button := (UpdatingSimpleButtonMorph newWithLabel: '-') target: self; wordingSelector: wordingSelector; actionSelector: actionSelector; setBalloonText: helpString translated; color: translator defaultBackgroundColor twiceDarker; + borderStyle: (BorderStyle raised width: 1); + cornerStyle: #square. - borderWidth: 1; - borderColor: #raised; cornerStyle: #square. "" ^ button!

1 0

The Trunk: PreferenceBrowser-mt.83.mcz
by commits＠source.squeak.org 06 May '18

06 May '18

Marcel Taeumel uploaded a new version of PreferenceBrowser to project The Trunk: http://source.squeak.org/trunk/PreferenceBrowser-mt.83.mcz ==================== Summary ==================== Name: PreferenceBrowser-mt.83 Author: mt Time: 6 May 2018, 3:14:32.145836 pm UUID: c19b2b4a-7fff-0d41-9e31-cd0cade6fc4d Ancestors: PreferenceBrowser-mt.82 Supplement to refactoring in Morphic-mt.1427. =============== Diff against PreferenceBrowser-mt.82 =============== Item was changed: ----- Method: PBClassPreferenceView>>textField (in category 'user interface') ----- textField | field | field := PluggableTextMorphPlus on: self text: #preferenceValue accept: #preferenceValue:. field + borderStyle: BorderStyle inset; + borderWidth: 1; hideScrollBarsIndefinitely; acceptOnCR: true; minimumHeight: 0; vResizing: #rigid; hResizing: #spaceFill; height: TextStyle defaultFont height + 6. styler ifNotNil: [:s | field styler: (s view: field)]. ^ field! Item was changed: ----- Method: PBNumericPreferenceView>>textField (in category 'user interface') ----- textField ^(PluggableTextMorph on: self text: #preferenceValue accept: #preferenceValue:) + borderStyle: BorderStyle inset; + borderWidth: 1; hideScrollBarsIndefinitely; acceptOnCR: true; vResizing: #rigid; hResizing: #spaceFill; height: TextStyle defaultFont height + 6; yourself.! Item was changed: ----- Method: PBTextPreferenceView>>textField (in category 'user interface') ----- textField ^(PluggableTextMorph on: self text: #preferenceValue accept: #preferenceValue:) hideScrollBarsIndefinitely; + borderStyle: BorderStyle inset; + borderWidth: 1; - borderColor: #inset; - acceptOnCR: true; - color: Color gray veryMuchLighter; vResizing: #rigid; hResizing: #spaceFill; height: TextStyle defaultFont height + 6; yourself.! Item was changed: ----- Method: PreferenceBrowserMorph>>updateSelectedCategoryPreferences (in category 'updating') ----- updateSelectedCategoryPreferences Cursor wait showWhile: [self preferenceList hScrollBarValue: 0; vScrollBarValue: 0. self preferenceList scroller removeAllMorphs. self preferenceList scroller addMorphBack: self newPreferenceListInnerPanel. + self adjustPreferenceListItemsWidth. + self adoptPaneColor: self paneColor]! - self adjustPreferenceListItemsWidth]!

1 0

The Trunk: MorphicTests-mt.46.mcz
by commits＠source.squeak.org 06 May '18

06 May '18

Marcel Taeumel uploaded a new version of MorphicTests to project The Trunk: http://source.squeak.org/trunk/MorphicTests-mt.46.mcz ==================== Summary ==================== Name: MorphicTests-mt.46 Author: mt Time: 6 May 2018, 3:12:17.556836 pm UUID: da7669ef-c6b9-1e4b-a096-8ecab904367e Ancestors: MorphicTests-mt.45 Supplement to refactoring in Morphic-mt.1427. =============== Diff against MorphicTests-mt.45 =============== Item was added: + TestCase subclass: #BorderedMorphTests + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'MorphicTests-Basic'! Item was added: + ----- Method: BorderedMorphTests>>test01OldInstVarRefs (in category 'tests') ----- + test01OldInstVarRefs + "Only BorderedMorph should reference the (deprecated) borderWidth and borderColor isntance variables." + + self + assert: 2 + equals: (SystemNavigation default allAccessesTo: #borderWidth from: BorderedMorph) size. + + self + assert: 2 + equals: (SystemNavigation default allAccessesTo: #borderColor from: BorderedMorph) size.! Item was added: + ----- Method: BorderedMorphTests>>test02ConvertColorSymbols (in category 'tests') ----- + test02ConvertColorSymbols + "The use of #inset or #raised as border color should result in the use of a new border style." + + | sut | + sut := BorderedMorph new. + self + assert: #simple equals: sut borderStyle style; + assert: Color black equals: sut borderStyle color. + + sut borderColor: #raised. + self + assert: #raised equals: sut borderStyle style; + assert: Color black equals: sut borderStyle color. + + "Enable color tracking." + sut borderColor: Color transparent. + self assert: sut color equals: sut borderStyle color. + + sut borderColor: #inset. + self + assert: #inset equals: sut borderStyle style; + assert: sut color equals: sut borderStyle color. + ! Item was added: + ----- Method: BorderedMorphTests>>test03ColorTracking (in category 'tests') ----- + test03ColorTracking + + | sut c1 c2 | + sut := BorderedMorph new. + self assert: Color black equals: sut borderStyle baseColor. + + sut borderInset. + self + assert: Color transparent equals: sut borderStyle baseColor; + assert: sut borderStyle topLeftColor ~= sut color; + assert: sut borderStyle bottomRightColor ~= sut color; + assert: sut borderStyle bottomRightColor ~= sut borderStyle topLeftColor. + + c1 := sut borderStyle topLeftColor. + c2 := sut borderStyle bottomRightColor. + sut color: Color yellow. + self + assert: Color transparent equals: sut borderStyle baseColor; + assert: sut borderStyle topLeftColor ~= c1; + assert: sut borderStyle bottomRightColor ~= c2. + + c1 := sut borderStyle topLeftColor. + c2 := sut borderStyle bottomRightColor. + sut borderStyle: BorderStyle raised. + self + assert: Color transparent equals: sut borderStyle baseColor; + assert: sut borderStyle topLeftColor = c2; + assert: sut borderStyle bottomRightColor = c1.!

1 0

The Trunk: ToolBuilder-Morphic-mt.218.mcz
by commits＠source.squeak.org 06 May '18

06 May '18

Marcel Taeumel uploaded a new version of ToolBuilder-Morphic to project The Trunk: http://source.squeak.org/trunk/ToolBuilder-Morphic-mt.218.mcz ==================== Summary ==================== Name: ToolBuilder-Morphic-mt.218 Author: mt Time: 6 May 2018, 3:10:50.780836 pm UUID: bfe61530-c6b4-9847-983f-84505197bcfa Ancestors: ToolBuilder-Morphic-mt.217 Supplement to refactoring in Morphic-mt.1427. =============== Diff against ToolBuilder-Morphic-mt.217 =============== Item was changed: ----- Method: PluggableButtonMorphPlus>>updateFillStylePressing:hovering: (in category 'initialize-release') ----- updateFillStylePressing: isPressing hovering: isHovering enabled ifFalse: [ self color: (disabledColor ifNil: [Color transparent]). + self borderStyle baseColor: disabledTextColor. - self borderStyle color: disabledTextColor. ^ self]. super updateFillStylePressing: isPressing hovering: isHovering.!

1 0

The Trunk: MorphicExtras-mt.235.mcz
by commits＠source.squeak.org 06 May '18

06 May '18

Marcel Taeumel uploaded a new version of MorphicExtras to project The Trunk: http://source.squeak.org/trunk/MorphicExtras-mt.235.mcz ==================== Summary ==================== Name: MorphicExtras-mt.235 Author: mt Time: 6 May 2018, 3:10:08.770836 pm UUID: 7bbc63fd-940b-b045-bd7f-762404cede6d Ancestors: MorphicExtras-kfr.234 Supplement to refactoring in Morphic-mt.1427. =============== Diff against MorphicExtras-kfr.234 =============== Item was changed: ----- Method: BasicButton>>label: (in category 'as yet unclassified') ----- label: aString | oldLabel m | (oldLabel := self findA: StringMorph) ifNotNil: [oldLabel delete]. m := StringMorph contents: aString font: TextStyle defaultFont. + self extent: m extent + (self borderWidth + 6). - self extent: m extent + (borderWidth + 6). m position: self center - (m extent // 2). self addMorph: m. m lock! Item was changed: ----- Method: BookMorph>>bookmarkForThisPage (in category 'menu') ----- bookmarkForThisPage "If this book exists on a server, make the reference via a URL" | bb url um | (url := self url) ifNil: [ bb := SimpleButtonMorph new target: self. bb actionSelector: #goToPageMorph:fromBookmark:. bb label: 'Bookmark' translated. bb arguments: (Array with: currentPage with: bb). self primaryHand attachMorph: bb. ^ bb]. currentPage url ifNil: [currentPage saveOnURLbasic]. um := URLMorph newForURL: currentPage url. um setURL: currentPage url page: currentPage sqkPage. (SqueakPage stemUrl: url) = (SqueakPage stemUrl: currentPage url) ifTrue: [um book: true] ifFalse: [um book: url]. "remember which book" um isBookmark: true; label: 'Bookmark' translated. + um borderStyle: (BorderStyle raised width: 1). - um borderWidth: 1; borderColor: #raised. um color: (Color r: 0.4 g: 0.8 b: 0.6). self primaryHand attachMorph: um. ^ um! Item was changed: ----- Method: BorderedMorph>>fullPrintOn: (in category '*MorphicExtras-printing') ----- fullPrintOn: aStream aStream nextPutAll: '('. super fullPrintOn: aStream. + aStream nextPutAll: ') setBorderWidth: '; print: self borderWidth; + nextPutAll: ' borderColor: ' , (self colorString: self borderColor)! - aStream nextPutAll: ') setBorderWidth: '; print: borderWidth; - nextPutAll: ' borderColor: ' , (self colorString: borderColor)! Item was changed: ----- Method: EmbeddedWorldBorderMorph>>genericBoxArea: (in category 'boxes') ----- genericBoxArea: countDownFromTop + ^self innerBounds right @ (self top + (countDownFromTop * 2 * self borderWidth)) + extent: self borderWidth asPoint - ^self innerBounds right @ (self top + (countDownFromTop * 2 * borderWidth)) - extent: borderWidth @ borderWidth ! Item was changed: ----- Method: EmbeddedWorldBorderMorph>>myWorldChanged (in category 'as yet unclassified') ----- myWorldChanged | trans | trans := self myTransformation. self changed. self layoutChanged. trans ifNotNil:[ trans extentFromParent: self innerBounds extent. + bounds := self bounds topLeft extent: trans extent + (self borderWidth * 2). - bounds := bounds topLeft extent: trans extent + (borderWidth * 2). ]. self changed. ! Item was changed: ----- Method: EnvelopeLineMorph>>vertices:borderWidth:borderColor: (in category 'initialization') ----- vertices: verts borderWidth: bw borderColor: bc super initialize. vertices := verts. + self borderWidth: bw. + self borderColor: bc. + - borderWidth := bw. - borderColor := bc. closed := false. arrows := #none. self computeBounds! Item was changed: ----- Method: EventRecorderMorph>>defaultBorderColor (in category 'initialization') ----- defaultBorderColor + ^ Color transparent! - "answer the default border color/fill style for the receiver" - ^ #raised! Item was added: + ----- Method: EventRecorderMorph>>defaultBorderStyle (in category 'initialization') ----- + defaultBorderStyle + ^ BorderStyle raised! Item was changed: ----- Method: FlapTab>>assumeString:font:orientation:color: (in category 'textual tabs') ----- assumeString: aString font: aFont orientation: orientationSymbol color: aColor | aTextMorph workString tabStyle | labelString := aString asString. workString := orientationSymbol == #vertical ifTrue: [String streamContents: [:s | labelString do: [:c | s nextPut: c] separatedBy: [s nextPut: Character cr]]] ifFalse: [labelString]. tabStyle := (TextStyle new) leading: 0; newFontArray: (Array with: aFont). aTextMorph := (TextMorph new setTextStyle: tabStyle) contents: (workString asText addAttribute: (TextKern kern: 3)). self removeAllMorphs. + self borderStyle: (BorderStyle raised width: 2). - self - borderWidth: 2; - borderColor: #raised. aColor ifNotNil: [self color: aColor]. self addMorph: aTextMorph centered. aTextMorph lock " FlapTab allSubInstancesDo: [:ft | ft reformatTextualTab] "! Item was changed: ----- Method: Flaps class>>paintFlapButton (in category 'miscellaneous') ----- paintFlapButton "Answer a button to serve as the paint flap" | pb oldArgs brush myButton m | pb := PaintBoxMorph new submorphNamed: #paint:. pb ifNil: [(brush := Form extent: 16@16 depth: 16) fillColor: Color red] ifNotNil: [oldArgs := pb arguments. brush := oldArgs third. brush := brush copy: (2@0 extent: 42@38). brush := brush scaledToSize: brush extent // 2]. myButton := BorderedMorph new. + myButton color: (Color r: 0.833 g: 0.5 b: 0.0); borderStyle: (BorderStyle raised width: 2). - myButton color: (Color r: 0.833 g: 0.5 b: 0.0); borderWidth: 2; borderColor: #raised. myButton addMorph: (m := brush asMorph lock). myButton extent: m extent + (myButton borderWidth + 6). m position: myButton center - (m extent // 2). ^ myButton ! Item was changed: ----- Method: GradientFillMorph>>initialize (in category 'initialization') ----- initialize super initialize. + self borderWidth: 0. - borderWidth := 0. fillColor2 := Color black. gradientDirection := #vertical! Item was changed: ----- Method: GraphMorph>>centerCursor (in category 'commands') ----- centerCursor "Scroll so that the cursor is as close as possible to the center of my window." | w | + w := self width - (2 * self borderWidth). - w := self width - (2 * borderWidth). self startIndex: ((cursor - (w // 2)) max: 1). ! Item was changed: ----- Method: GraphMorph>>drawDataOn: (in category 'private') ----- drawDataOn: aCanvas | yScale baseLine x start end value left top bottom right | super drawOn: aCanvas. data isEmpty ifTrue: [^ self]. maxVal = minVal ifTrue: [ yScale := 1. ] ifFalse: [ + yScale := (self bounds height - (2 * self borderWidth)) asFloat / (maxVal - minVal)]. + baseLine := self bounds bottom - self borderWidth + (minVal * yScale) truncated. - yScale := (bounds height - (2 * borderWidth)) asFloat / (maxVal - minVal)]. - baseLine := bounds bottom - borderWidth + (minVal * yScale) truncated. left := top := 0. right := 10. bottom := 0. + x := self bounds left + self borderWidth. - x := bounds left + borderWidth. start := (startIndex asInteger max: 1) min: data size. + end := (start + self bounds width) min: data size. - end := (start + bounds width) min: data size. start to: end do: [:i | left := x truncated. right := x + 1. + right > (self bounds right - self borderWidth) ifTrue: [^ self]. - right > (bounds right - borderWidth) ifTrue: [^ self]. value := (data at: i) asFloat. value >= 0.0 ifTrue: [ top := baseLine - (yScale * value) truncated. bottom := baseLine. ] ifFalse: [ top := baseLine. bottom := baseLine - (yScale * value) truncated]. aCanvas fillRectangle: (left@top corner: right@bottom) color: dataColor. x := x + 1]. ! Item was changed: ----- Method: GraphMorph>>keepIndexInView: (in category 'private') ----- keepIndexInView: index | w newStart | + w := self bounds width - (2 * self borderWidth). - w := bounds width - (2 * borderWidth). index < startIndex ifTrue: [ newStart := index - w + 1. ^ self startIndex: (newStart max: 1)]. index > (startIndex + w) ifTrue: [ ^ self startIndex: (index min: data size)]. ! Item was changed: ----- Method: GraphMorph>>mouseMove: (in category 'event handling') ----- mouseMove: evt | x w | + x := evt cursorPoint x - (self bounds left + self borderWidth). + w := self width - (2 * self borderWidth). - x := evt cursorPoint x - (bounds left + borderWidth). - w := self width - (2 * borderWidth). self changed. x < 0 ifTrue: [ cursor := startIndex + (3 * x). cursor := (cursor max: 1) min: data size. ^ self startIndex: cursor]. x > w ifTrue: [ cursor := startIndex + w + (3 * (x - w)). cursor := (cursor max: 1) min: data size. ^ self startIndex: cursor - w]. cursor := ((startIndex + x) max: 1) min: data size. ! Item was changed: ----- Method: KeyboardMorphForInput>>addRecordingControls (in category 'initialization') ----- addRecordingControls | button switch playRow durRow articRow modRow | "Add chord, rest and delete buttons" playRow := AlignmentMorph newRow. playRow color: color; borderWidth: 0; layoutInset: 0. playRow hResizing: #shrinkWrap; vResizing: #shrinkWrap; extent: 5@5. switch := SimpleSwitchMorph new target: self; borderWidth: 2; offColor: color; onColor: (Color r: 1.0 g: 0.6 b: 0.6); setSwitchState: false. playRow addMorphBack: (switch label: 'chord' translated; actionSelector: #buildChord:). button := SimpleButtonMorph new target: self; + borderStyle: (BorderStyle raised width: 2); color: color. - borderColor: #raised; borderWidth: 2; color: color. playRow addMorphBack: (button label: ' rest ' translated; actionSelector: #emitRest). button := SimpleButtonMorph new target: self; + borderStyle: (BorderStyle raised width: 2); color: color. - borderColor: #raised; borderWidth: 2; color: color. playRow addMorphBack: (button label: 'del' translated; actionSelector: #deleteNotes). self addMorph: playRow. playRow align: playRow fullBounds topCenter with: self fullBounds bottomCenter. "Add note duration buttons" durRow := AlignmentMorph newRow. durRow color: color; borderWidth: 0; layoutInset: 0. durRow hResizing: #shrinkWrap; vResizing: #shrinkWrap; extent: 5@5. switch := SimpleSwitchMorph new target: self; borderWidth: 2; offColor: color; onColor: (Color r: 1.0 g: 0.6 b: 0.6); setSwitchState: false. durRow addMorphBack: (switch label: 'whole' translated; actionSelector: #duration:onOff:; arguments: #(1)). switch := SimpleSwitchMorph new target: self; borderWidth: 2; offColor: color; onColor: (Color r: 1.0 g: 0.6 b: 0.6); setSwitchState: false. durRow addMorphBack: (switch label: 'half' translated; actionSelector: #duration:onOff:; arguments: #(2)). switch := SimpleSwitchMorph new target: self; borderWidth: 2; offColor: color; onColor: (Color r: 1.0 g: 0.6 b: 0.6); setSwitchState: false. durRow addMorphBack: (switch label: 'quarter' translated; actionSelector: #duration:onOff:; arguments: #(4)). switch := SimpleSwitchMorph new target: self; borderWidth: 2; offColor: color; onColor: (Color r: 1.0 g: 0.6 b: 0.6); setSwitchState: false. durRow addMorphBack: (switch label: 'eighth' translated; actionSelector: #duration:onOff:; arguments: #(8)). switch := SimpleSwitchMorph new target: self; borderWidth: 2; offColor: color; onColor: (Color r: 1.0 g: 0.6 b: 0.6); setSwitchState: false. durRow addMorphBack: (switch label: 'sixteenth' translated; actionSelector: #duration:onOff:; arguments: #(16)). self addMorph: durRow. durRow align: durRow fullBounds topCenter with: playRow fullBounds bottomCenter. "Add note duration modifier buttons" modRow := AlignmentMorph newRow. modRow color: color; borderWidth: 0; layoutInset: 0. modRow hResizing: #shrinkWrap; vResizing: #shrinkWrap; extent: 5@5. switch := SimpleSwitchMorph new target: self; borderWidth: 2; offColor: color; onColor: (Color r: 1.0 g: 0.6 b: 0.6); setSwitchState: false. modRow addMorphBack: (switch label: 'dotted' translated; actionSelector: #durMod:onOff:; arguments: #(dotted)). switch := SimpleSwitchMorph new target: self; borderWidth: 2; offColor: color; onColor: (Color r: 1.0 g: 0.6 b: 0.6); setSwitchState: false. modRow addMorphBack: (switch label: 'normal' translated; actionSelector: #durMod:onOff:; arguments: #(normal)). switch := SimpleSwitchMorph new target: self; borderWidth: 2; offColor: color; onColor: (Color r: 1.0 g: 0.6 b: 0.6); setSwitchState: false. modRow addMorphBack: (switch label: 'triplets' translated; actionSelector: #durMod:onOff:; arguments: #(triplets)). switch := SimpleSwitchMorph new target: self; borderWidth: 2; offColor: color; onColor: (Color r: 1.0 g: 0.6 b: 0.6); setSwitchState: false. modRow addMorphBack: (switch label: 'quints' translated; actionSelector: #durMod:onOff:; arguments: #(quints)). self addMorph: modRow. modRow align: modRow fullBounds topCenter with: durRow fullBounds bottomCenter. "Add articulation buttons" articRow := AlignmentMorph newRow. articRow color: color; borderWidth: 0; layoutInset: 0. articRow hResizing: #shrinkWrap; vResizing: #shrinkWrap; extent: 5@5. switch := SimpleSwitchMorph new target: self; borderWidth: 2; offColor: color; onColor: (Color r: 1.0 g: 0.6 b: 0.6); setSwitchState: false. articRow addMorphBack: (switch label: 'legato' translated; actionSelector: #articulation:onOff:; arguments: #(legato)). switch := SimpleSwitchMorph new target: self; borderWidth: 2; offColor: color; onColor: (Color r: 1.0 g: 0.6 b: 0.6); setSwitchState: false. articRow addMorphBack: (switch label: 'normal' translated; actionSelector: #articulation:onOff:; arguments: #(normal)). switch := SimpleSwitchMorph new target: self; borderWidth: 2; offColor: color; onColor: (Color r: 1.0 g: 0.6 b: 0.6); setSwitchState: false. articRow addMorphBack: (switch label: 'staccato' translated; actionSelector: #articulation:onOff:; arguments: #(staccato)). self addMorph: articRow. articRow align: articRow fullBounds topCenter with: modRow fullBounds bottomCenter. + self bounds: (self fullBounds expandBy: (0@0 extent: 0 @ self borderWidth)) - self bounds: (self fullBounds expandBy: (0@0 extent: 0@borderWidth)) ! Item was changed: ----- Method: MagnifierMorph>>defaultExtent (in category 'geometry') ----- defaultExtent + ^(srcExtent * magnification) truncated + (2 * self borderWidth)! - ^(srcExtent * magnification) truncated + (2 * borderWidth)! Item was changed: ----- Method: MagnifierMorph>>extent: (in category 'geometry') ----- extent: aPoint "Round to multiples of magnification" + srcExtent := (aPoint - (2 * self borderWidth)) // magnification. - srcExtent := (aPoint - (2 * borderWidth)) // magnification. ^super extent: self defaultExtent! 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: [: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). 1 to: nWhite do: [: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))]. 1 to: nBlack do: [: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))]]. 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 + self borderWidth - 1)! - self extent: (self fullBounds extent + borderWidth - 1)! Item was changed: ----- Method: PianoRollScoreMorph>>addNotes (in category 'drawing') ----- addNotes "Recompute the set of morphs that should be visible at the current scroll position." | visibleMorphs rightEdge topEdge rightEdgeTime | visibleMorphs := OrderedCollection new: 500. + rightEdge := self right - self borderWidth. - rightEdge := self right - borderWidth. rightEdgeTime := self timeForX: rightEdge. + topEdge := self top + self borderWidth + 1. - topEdge := self top + borderWidth + 1. "Add ambient morphs first (they will be front-most)" score eventMorphsWithTimeDo: [:m :t | m addMorphsTo: visibleMorphs pianoRoll: self eventTime: t betweenTime: leftEdgeTime and: rightEdgeTime]. "Then add note morphs" score tracks withIndexDo: [:track :trackIndex | | done n i nRight nTop nLeft trackColor | trackColor := colorForTrack at: trackIndex. i := indexInTrack at: trackIndex. done := scorePlayer mutedForTrack: trackIndex. [done | (i > track size)] whileFalse: [ n := track at: i. (n isNoteEvent and: [n midiKey >= lowestNote]) ifTrue: [ n time > rightEdgeTime ifTrue: [done := true] ifFalse: [ nLeft := self xForTime: n time. nTop := (self yForMidiKey: n midiKey) - 1. nTop > topEdge ifTrue: [ nRight := nLeft + (n duration * timeScale) truncated - 1. visibleMorphs add: ((PianoRollNoteMorph newBounds: (nLeft@nTop corner: nRight@(nTop + 3)) color: trackColor) trackIndex: trackIndex indexInTrack: i)]]]. i := i + 1]. (selection notNil and: [trackIndex = selection first and: [i >= selection second and: [(indexInTrack at: trackIndex) <= selection third]]]) ifTrue: [visibleMorphs do: [:vm | (vm isKindOf: PianoRollNoteMorph) ifTrue: [vm selectFrom: selection]]]]. "Add the cursor morph in front of all notes; height and position are set later." cursor ifNil: [cursor := Morph newBounds: (self topLeft extent: 1@1) color: Color red]. visibleMorphs addFirst: cursor. self changed. self removeAllMorphs. self addAllMorphs: visibleMorphs. ! Item was changed: ----- Method: PianoRollScoreMorph>>drawMeasureLinesOn: (in category 'drawing') ----- drawMeasureLinesOn: aCanvas | ticksPerMeas x measureLineColor inner | showBeatLines ifNil: [showBeatLines := false]. showMeasureLines ifNil: [showMeasureLines := true]. notePerBeat ifNil: [self timeSignature: 4 over: 4]. showBeatLines ifTrue: [measureLineColor := Color gray: 0.8. ticksPerMeas := score ticksPerQuarterNote. inner := self innerBounds. (leftEdgeTime + ticksPerMeas truncateTo: ticksPerMeas) + to: ((self timeForX: self right - self borderWidth) truncateTo: ticksPerMeas) - to: ((self timeForX: self right - borderWidth) truncateTo: ticksPerMeas) by: ticksPerMeas do: [:tickTime | x := self xForTime: tickTime. aCanvas fillRectangle: (x @ inner top extent: 1 @ inner height) color: measureLineColor]]. showMeasureLines ifTrue: [measureLineColor := Color gray: 0.7. ticksPerMeas := beatsPerMeasure*score ticksPerQuarterNote*4//notePerBeat. inner := self innerBounds. (leftEdgeTime + ticksPerMeas truncateTo: ticksPerMeas) + to: ((self timeForX: self right - self borderWidth) truncateTo: ticksPerMeas) - to: ((self timeForX: self right - borderWidth) truncateTo: ticksPerMeas) by: ticksPerMeas do: [:tickTime | x := self xForTime: tickTime. aCanvas fillRectangle: (x @ inner top extent: 1 @ inner height) color: (tickTime = 0 ifTrue: [Color black] ifFalse: [measureLineColor])]]. ! Item was changed: ----- Method: PianoRollScoreMorph>>drawStaffOn: (in category 'drawing') ----- drawStaffOn: aCanvas | blackKeyColor l r topEdge y | self drawMeasureLinesOn: aCanvas. blackKeyColor := Color gray: 0.5. + l := self left + self borderWidth. + r := self right - self borderWidth. + topEdge := self top + self borderWidth + 3. - l := self left + borderWidth. - r := self right - borderWidth. - topEdge := self top + borderWidth + 3. lowestNote to: 127 do: [:k | y := self yForMidiKey: k. y <= topEdge ifTrue: [^ self]. "over the top!!" (self isBlackKey: k) ifTrue: [ aCanvas fillRectangle: (l@y corner: r@(y + 1)) color: blackKeyColor]]. ! Item was changed: ----- Method: PianoRollScoreMorph>>midiKeyForY: (in category 'geometry') ----- midiKeyForY: y + ^ lowestNote - ((y - (bounds bottom - self borderWidth - 4)) // 3) - ^ lowestNote - ((y - (bounds bottom - borderWidth - 4)) // 3) ! Item was changed: ----- Method: PianoRollScoreMorph>>moveCursorToTime: (in category 'scrolling') ----- moveCursorToTime: scoreTime | cursorOffset desiredCursorHeight | scorePlayer isPlaying ifTrue: [cursorOffset := ((scoreTime - leftEdgeTime) asFloat * timeScale) asInteger. (cursorOffset < 0 or: [cursorOffset > (self width-20)]) ifTrue: [self goToTime: scoreTime - (20/timeScale). cursorOffset := ((scoreTime - leftEdgeTime) asFloat * timeScale) asInteger]] ifFalse: [self goToTime: (scoreTime - (self width//2 / timeScale) max: (self width//10 / timeScale) negated). cursorOffset := ((scoreTime - leftEdgeTime) asFloat * timeScale) asInteger]. + cursor position: (self left + self borderWidth + cursorOffset)@(self top + self borderWidth). - cursor position: (self left + borderWidth + cursorOffset)@(self top + borderWidth). desiredCursorHeight := self height. cursor height ~= desiredCursorHeight ifTrue: [cursor extent: 1@desiredCursorHeight]. ! Item was changed: ----- Method: PianoRollScoreMorph>>timeForX: (in category 'geometry') ----- timeForX: aNumber + ^ ((aNumber - self left - self borderWidth) asFloat / timeScale + leftEdgeTime) asInteger! - ^ ((aNumber - bounds left - borderWidth) asFloat / timeScale + leftEdgeTime) asInteger! Item was changed: ----- Method: PianoRollScoreMorph>>xForTime: (in category 'geometry') ----- xForTime: aNumber + ^ ((aNumber - leftEdgeTime) asFloat * timeScale) asInteger + self left + self borderWidth - ^ ((aNumber - leftEdgeTime) asFloat * timeScale) asInteger + bounds left + borderWidth ! Item was changed: ----- Method: PianoRollScoreMorph>>yForMidiKey: (in category 'geometry') ----- yForMidiKey: midiKey + ^ (self bottom - self borderWidth - 4) - (3 * (midiKey - lowestNote)) - ^ (bounds bottom - borderWidth - 4) - (3 * (midiKey - lowestNote)) ! Item was changed: ----- Method: ProjectNavigationMorph>>buttonLanguage (in category 'the buttons') ----- buttonLanguage "Answer a button for finding/loading projects" ^ SimpleButtonDelayedMenuMorph new target: self; + borderStyle: BorderStyle raised; - borderColor: #raised; color: self colorForButtons; label: Project current naturalLanguage font: self fontForButtons; setBalloonText: 'Click here to choose your language.' translated; actionSelector: #chooseLanguage! Item was changed: ----- Method: ProjectNavigationMorph>>buttonSound (in category '*MorphicExtras-Sound') ----- buttonSound | myButton m | myButton := RectangleMorph new - borderWidth: 1; cornerStyle: #rounded; + borderStyle: (BorderStyle raised width: 1); - borderColor: #raised; color: self colorForButtons; setBalloonText: 'Change sound volume' translated; on: #mouseDown send: #soundDownEvt:morph: to: self; on: #mouseStillDown send: #soundStillDownEvt:morph: to: self; on: #mouseUp send: #soundUpEvt:morph: to: self; yourself. myButton addMorph: (m := self speakerIcon lock). myButton extent: m extent + (myButton borderWidth + 6). m position: myButton center - (m extent // 2). ^myButton ! Item was changed: ----- Method: ProjectNavigationMorph>>makeButton:balloonText:for: (in category 'as yet unclassified') ----- makeButton: aString balloonText: anotherString for: aSymbol ^ SimpleButtonDelayedMenuMorph new target: self; + borderStyle: BorderStyle raised; - borderColor: #raised; color: self colorForButtons; label: aString font: self fontForButtons; setBalloonText: anotherString; actionSelector: aSymbol! Item was changed: ----- Method: ProjectNavigationMorph>>makeUpdatingButtonWithBalloonText:actionSelector:wordingSelector: (in category 'as yet unclassified') ----- makeUpdatingButtonWithBalloonText: balloonString actionSelector: actionSymbol wordingSelector: wordingSymbol "Answer a button whose target is the receiver (i.e. a ProjectNavigationMorph), who gets its wording by sending the wordingSelector to me. The given string" | aButton | aButton := UpdatingSimpleButtonMorph new. aButton target: self; + borderStyle: BorderStyle raised; - borderColor: #raised; color: self colorForButtons; label: '-' font: self fontForButtons; setBalloonText: balloonString translated; actionSelector: actionSymbol; wordingSelector: wordingSymbol. aButton step. ^ aButton ! Item was changed: ----- Method: ProjectNavigationMorph>>soundDownEvt:morph: (in category '*MorphicExtras-Sound') ----- soundDownEvt: a morph: b soundSlider ifNotNil: [soundSlider delete]. (soundSlider := RectangleMorph new) setProperty: #morphicLayerNumber toValue: 1; extent: b width @ (b width * 3); color: self colorForButtons; + borderStyle: BorderStyle raised; - borderColor: #raised; bottomLeft: b boundsInWorld origin. soundSlider addMorph: ( RectangleMorph new color: self colorForButtons; borderColor: #raised; extent: b width @ 8; center: soundSlider center x @ (soundSlider bottom - (soundSlider height * self getSoundVolume) asInteger) ). soundSlider openInWorld.! Item was changed: ----- Method: RecordingControlsMorph>>initialize (in category 'initialization') ----- initialize | r full | super initialize. self hResizing: #shrinkWrap; vResizing: #shrinkWrap. + self borderWidth: 2. - borderWidth := 2. self listDirection: #topToBottom. recorder := SoundRecorder new. full := self addButtonRows. self addRecordLevelSliderIn: full. r := AlignmentMorph newRow vResizing: #shrinkWrap. r addMorphBack: (self makeRecordMeterIn: full). self addMorphBack: r. self extent: 10@10. "make minimum size" ! Item was changed: ----- Method: ReferenceMorph>>preserveDetails (in category 'menu') ----- preserveDetails "The receiver is being switched to use a different format. Preserve the existing details (e.g. wording if textual, grapheme if graphical) so that if the user reverts back to the current format, the details will be right" self isCurrentlyTextual ifTrue: [self setProperty: #priorWording toValue: self existingWording. + self setProperty: #priorColor toValue: self color. + self setProperty: #priorBorderWidth toValue: self borderWidth] - self setProperty: #priorColor toValue: color. - self setProperty: #priorBorderWidth toValue: borderWidth] ifFalse: + [self setProperty: #priorGraphic toValue: self firstSubmorph form]! - [self setProperty: #priorGraphic toValue: submorphs first form]! Item was changed: ----- Method: ScorePlayerMorph>>onScorePlayer:title: (in category 'initialization') ----- onScorePlayer: aScorePlayer title: scoreName | divider col r | scorePlayer := aScorePlayer. scorePlayer ifNotNil: [scorePlayer reset. instrumentSelector := Array new: scorePlayer score tracks size]. self removeAllMorphs. self addMorphBack: self makeControls. scorePlayer ifNil: [^ self]. r := self makeRow hResizing: #spaceFill; vResizing: #shrinkWrap. r addMorphBack: self rateControl; addMorphBack: (Morph newBounds: (0@0 extent: 20@0) color: Color transparent); addMorphBack: self volumeControl. self addMorphBack: r. self addMorphBack: self scrollControl. col := AlignmentMorph newColumn color: color; layoutInset: 0. self addMorphBack: col. 1 to: scorePlayer trackCount do: [:trackIndex | divider := AlignmentMorph new extent: 10@1; - borderWidth: 1; layoutInset: 0; + borderStyle: (BorderStyle raised width: 1); - borderColor: #raised; color: color; hResizing: #spaceFill; vResizing: #rigid. col addMorphBack: divider. col addMorphBack: (self trackControlsFor: trackIndex)]. LastMIDIPort ifNotNil: [ "use the most recently set MIDI port" scorePlayer openMIDIPort: LastMIDIPort]. ! Item was changed: ----- Method: ScorePlayerMorph>>standaloneResumeButton (in category 'layout') ----- standaloneResumeButton | r | r := AlignmentMorph newRow. r color: Color red; borderWidth: 0; layoutInset: 6; useRoundedCorners. r hResizing: #shrinkWrap; vResizing: #shrinkWrap; extent: 5@5. r addMorphBack: ( SimpleButtonMorph new target: [ scorePlayer resumePlaying. r delete ]; + borderStyle: (BorderStyle raised width: 2); - borderColor: #raised; - borderWidth: 2; color: Color green; label: 'Continue' translated; actionSelector: #value ). r setBalloonText: 'Continue playing a paused presentation' translated. ^r ! Item was changed: ----- Method: SimpleSwitchMorph>>initializeWithLabel: (in category 'initialization') ----- initializeWithLabel: labelString super initializeWithLabel: labelString. self borderWidth: 3. self extent: self extent + 2. onColor := Color r: 1.0 g: 0.6 b: 0.6. offColor := Color lightGray. + + self turnOff.! - color := offColor - ! Item was changed: ----- Method: SimpleSwitchMorph>>turnOff (in category 'switching') ----- turnOff + self borderRaised. - self borderColor: #raised. self color: offColor! Item was changed: ----- Method: SimpleSwitchMorph>>turnOn (in category 'switching') ----- turnOn + self borderInset. - self borderColor: #inset. self color: onColor! Item was changed: ----- Method: SoundLoopMorph>>buildSound (in category 'playing') ----- buildSound "Build a compound sound for the next iteration of the loop." | mixer soundMorphs | mixer := MixedSound new. + mixer add: (RestSound dur: (self width - (2 * self borderWidth)) / 128.0). - mixer add: (RestSound dur: (self width - (2 * borderWidth)) / 128.0). soundMorphs := self submorphs select: [:m | m respondsTo: #sound]. soundMorphs do: [:m | | startTime pan | + startTime := (m position x - (self left + self borderWidth)) / 128.0. + pan := (m position y - (self top + self borderWidth)) asFloat / (self height - (2 * self borderWidth) - m height). - startTime := (m position x - (self left + borderWidth)) / 128.0. - pan := (m position y - (self top + borderWidth)) asFloat / (self height - (2 * borderWidth) - m height). mixer add: ((RestSound dur: startTime), m sound copy) pan: pan]. ^ mixer ! Item was changed: ----- Method: TabSorterMorph>>initialize (in category 'initialization') ----- initialize "Initialize the receiver." super initialize. self removeAllMorphs. self extent: 300@100. pageHolder := PasteUpMorph new. pageHolder vResizeToFit: true; autoLineLayout: true. + pageHolder extent: self extent - self borderWidth. - pageHolder extent: self extent - borderWidth. pageHolder padding: 8. pageHolder cursor: 0. pageHolder wantsMouseOverHalos: false. self addControls. self addMorphBack: pageHolder! Item was changed: ----- Method: ThreadNavigationMorph>>makeButton:balloonText:for: (in category 'initialization') ----- makeButton: aString balloonText: anotherString for: aSymbol ^ SimpleButtonDelayedMenuMorph new target: self; + borderStyle: BorderStyle raised; - borderColor: #raised; color: self colorForButtons; label: aString translated font: self fontForButtons; setBalloonText: anotherString translated; actionSelector: aSymbol! Item was changed: ----- Method: TwoWayScrollPane>>createScrollBarNamed: (in category 'initialization') ----- createScrollBarNamed: aString "creates a scroll bar named as aString" | result | result := ScrollBar new model: self slotName: aString. + result borderStyle: (BorderStyle inset width: 2). - result borderWidth: 2; - borderColor: #inset. ^ result! Item was changed: ----- Method: TwoWayScrollPane>>defaultBorderColor (in category 'initialization') ----- defaultBorderColor + ^ Color transparent! - "answer the default border color/fill style for the receiver" - ^ #inset! Item was added: + ----- Method: TwoWayScrollPane>>defaultBorderStyle (in category 'initialization') ----- + defaultBorderStyle + ^ BorderStyle inset! Item was changed: ----- Method: TwoWayScrollPane>>fitContents (in category 'geometry') ----- fitContents "Adjust my size to fit my contents reasonably snugly" self extent: scroller submorphBounds extent + (yScrollBar width @ xScrollBar height) + + (self borderWidth*2) - + (borderWidth*2) ! Item was changed: ----- Method: URLMorph>>drawOn: (in category 'drawing') ----- drawOn: aCanvas "Draw thumbnail for my page, if it is available. Otherwise, just draw a rectangle." + | thumbnail oldExt | + self color == Color transparent - | thumbnail oldExt | - color == Color transparent ifTrue: ["show thumbnail" thumbnail := self thumbnailOrNil. thumbnail + ifNil: [aCanvas frameRectangle: self bounds width: self borderWidth + color: self borderColor. + aCanvas fillRectangle: (self bounds insetBy: self borderWidth) color: self color] + ifNotNil: [oldExt := self bounds extent. + bounds := self bounds origin extent: thumbnail extent + (2@2). + aCanvas frameRectangle: self bounds width: self borderWidth color: self borderColor. + aCanvas paintImage: thumbnail at: self bounds origin + self borderWidth. - ifNil: [aCanvas frameRectangle: bounds width: borderWidth - color: borderColor. - aCanvas fillRectangle: (bounds insetBy: borderWidth) color: color] - ifNotNil: [oldExt := bounds extent. - bounds := bounds origin extent: thumbnail extent + (2@2). - aCanvas frameRectangle: bounds width: borderWidth color: borderColor. - aCanvas paintImage: thumbnail at: bounds origin + borderWidth. oldExt = thumbnail extent ifFalse: [self layoutChanged]]] ifFalse: ["show labeled button" ^ super drawOn: aCanvas] !

1 0

The Trunk: Graphics-mt.398.mcz
by commits＠source.squeak.org 06 May '18

06 May '18

Marcel Taeumel uploaded a new version of Graphics to project The Trunk: http://source.squeak.org/trunk/Graphics-mt.398.mcz ==================== Summary ==================== Name: Graphics-mt.398 Author: mt Time: 6 May 2018, 3:08:37.011836 pm UUID: 73c0a26a-9209-cb42-90b7-b679bb5b467d Ancestors: Graphics-mt.397 Supplement to refactoring in Morphic-mt.1427. =============== Diff against Graphics-mt.397 =============== Item was added: + ----- Method: Form class>>dotOfSize:color: (in category 'examples') ----- + dotOfSize: diameter color: color + + | form | + form := self extent: diameter asPoint depth: Display depth. + form getCanvas fillOval: form boundingBox color: color. + ^form!

1 0

The Trunk: System-mt.1023.mcz
by commits＠source.squeak.org 06 May '18

06 May '18

Marcel Taeumel uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-mt.1023.mcz ==================== Summary ==================== Name: System-mt.1023 Author: mt Time: 6 May 2018, 3:07:01.547836 pm UUID: 933c0495-6c3e-3947-9be9-c461397fe4e5 Ancestors: System-kfr.1022 Supplement to refactoring in Morphic-mt.1427. =============== Diff against System-kfr.1022 =============== Item was changed: ----- Method: CommunityTheme class>>addDarkMenusAndDockingBars: (in category 'instance creation') ----- addDarkMenusAndDockingBars: aUserInterfaceTheme "self createDark apply." aUserInterfaceTheme set: #borderWidth for: #MenuMorph to: 0; set: #color for: #MenuMorph to: Color darkGray twiceDarker; set: #titleTextColor for: #MenuMorph to: Color white; set: #lineColor for: #MenuMorph to: Color darkGray; + set: #lineStyle for: #MenuMorph to: BorderStyle simple; - set: #lineStyle for: #MenuMorph to: BorderStyle default; set: #lineWidth for: #MenuMorph to: 1. aUserInterfaceTheme set: #textColor for: #MenuItemMorph to: self dbForeground; set: #selectionColor for: #MenuItemMorph to: self dbSelection; set: #selectionTextColor for: #MenuItemMorph to: Color white ; set: #disabledTextColor for: #MenuItemMorph to: self dbForeground muchDarker. "set: #subMenuMarker for: #MenuItemMorph to: nil." "Use hard-coded default. See MenuItemMorph." "The world main docking bar." aUserInterfaceTheme " set: #color for: #DockingBarMorph to: Color darkGray;" " set: #selectionColor for: #DockingBarItemMorph to: self darkContentSecondary;" set: #logoColor for: #TheWorldMainDockingBar to: Color white; set: #selectionLogoColor for: #TheWorldMainDockingBar to: Color white! Item was changed: ----- Method: MonokaiTheme class>>addDarkMenusAndDockingBars: (in category 'instance creation') ----- addDarkMenusAndDockingBars: theme "self createDark apply." theme set: #borderWidth for: #MenuMorph to: 1; set: #borderColor for: #MenuMorph to: self invisibleColor; set: #color for: #MenuMorph to: self backgroundColor; set: #titleTextColor for: #MenuMorph to: self yellow; set: #lineColor for: #MenuMorph to: self invisibleColor; + set: #lineStyle for: #MenuMorph to: BorderStyle simple; - set: #lineStyle for: #MenuMorph to: BorderStyle default; set: #lineWidth for: #MenuMorph to: 1. theme set: #textColor for: #MenuItemMorph to: self foregroundColor; set: #disabledTextColor for: #MenuItemMorph to: self grayLight; set: #selectionColor for: #MenuItemMorph to: self invisibleColor; set: #selectionTextColor for: #MenuItemMorph to: self yellow. "set: #subMenuMarker for: #MenuItemMorph to: nil." "Use hard-coded default. See MenuItemMorph." "The world main docking bar." theme set: #color for: #DockingBarMorph to: self invisibleColor; set: #selectionColor for: #DockingBarItemMorph to: self grayLight; set: #logoColor for: #TheWorldMainDockingBar to: self foregroundColor; set: #selectionLogoColor for: #TheWorldMainDockingBar to: self yellow.! Item was changed: ----- Method: SolarizedTheme class>>addDarkMenusAndDockingBars: (in category 'instance creation') ----- addDarkMenusAndDockingBars: theme "self createDark apply." theme set: #borderWidth for: #MenuMorph to: 1; set: #borderColor for: #MenuMorph to: self darkBackgroundHighlights; set: #color for: #MenuMorph to: self darkBackground; set: #titleTextColor for: #MenuMorph to: self darkContentEmphasizedMore; set: #lineColor for: #MenuMorph to: self darkBackgroundHighlights; + set: #lineStyle for: #MenuMorph to: BorderStyle simple; - set: #lineStyle for: #MenuMorph to: BorderStyle default; set: #lineWidth for: #MenuMorph to: 1. theme set: #textColor for: #MenuItemMorph to: self darkContentEmphasized; set: #disabledTextColor for: #MenuItemMorph to: self darkContentSecondary; set: #selectionColor for: #MenuItemMorph to: self darkSelectionColor; set: #selectionTextColor for: #MenuItemMorph to: self darkSelectionTextColor. "set: #subMenuMarker for: #MenuItemMorph to: nil." "Use hard-coded default. See MenuItemMorph." "The world main docking bar." theme set: #color for: #DockingBarMorph to: self darkBackgroundHighlights; set: #selectionColor for: #DockingBarItemMorph to: self darkContentSecondary; set: #logoColor for: #TheWorldMainDockingBar to: self darkContentEmphasized; set: #selectionLogoColor for: #TheWorldMainDockingBar to: self darkContentEmphasizedMore.! Item was changed: ----- Method: SolarizedTheme class>>addLightMenusAndDockingBars: (in category 'instance creation') ----- addLightMenusAndDockingBars: theme "self createLight apply." theme set: #borderWidth for: #MenuMorph to: 1; set: #borderColor for: #MenuMorph to: self lightBackgroundHighlights; set: #color for: #MenuMorph to: self lightBackground; set: #titleTextColor for: #MenuMorph to: self lightContentEmphasizedMore; set: #lineColor for: #MenuMorph to: self lightBackgroundHighlights; + set: #lineStyle for: #MenuMorph to: BorderStyle simple; - set: #lineStyle for: #MenuMorph to: BorderStyle default; set: #lineWidth for: #MenuMorph to: 1. theme set: #textColor for: #MenuItemMorph to: self lightContentEmphasized; set: #disabledTextColor for: #MenuItemMorph to: self lightContentSecondary; set: #selectionColor for: #MenuItemMorph to: self lightBackgroundHighlights darker; set: #selectionTextColor for: #MenuItemMorph to: self lightContentEmphasizedMore. "set: #subMenuMarker for: #MenuItemMorph to: nil." "Use hard-coded default. See MenuItemMorph." "The world main docking bar." theme set: #color for: #DockingBarMorph to: self lightBackgroundHighlights; set: #selectionColor for: #DockingBarItemMorph to: self lightContentSecondary; set: #logoColor for: #TheWorldMainDockingBar to: self lightContentEmphasized; set: #selectionLogoColor for: #TheWorldMainDockingBar to: self lightContentEmphasizedMore.! Item was changed: ----- Method: SqueakTheme class>>addButtons: (in category 'instance creation') ----- addButtons: theme theme set: #borderColor for: #PluggableButtonMorph to: Color gray; set: #borderWidth for: #PluggableButtonMorph to: 1; + set: #borderStyle for: #PluggableButtonMorph to: BorderStyle simple; - set: #borderStyle for: #PluggableButtonMorph to: BorderStyle default; set: #color for: #PluggableButtonMorph to: (Color gray: 0.91); set: #font for: #PluggableButtonMorph to: [Preferences standardButtonFont]; set: #textColor for: #PluggableButtonMorph to: Color black; set: #selectionModifier for: #PluggableButtonMorph to: [ [:c | c adjustBrightness: -0.2] ]; set: #hoverModifier for: #PluggableButtonMorph to: [ [:c | c adjustBrightness: -0.1] ]; set: #feedbackModifier for: #PluggableButtonMorph to: [ [:c | c adjustBrightness: -0.3] ]. "And the plus-version." theme set: #disabledColor for: #PluggableButtonMorphPlus to: Color transparent; set: #disabledTextColor for: #PluggableButtonMorphPlus to: (Color gray: 0.6). "And the three-phase button." theme derive: #color for: #ThreePhaseButtonMorph from: #PluggableButtonMorph at: #textColor; derive: #font for: #ThreePhaseButtonMorph from: #PluggableButtonMorph; derive: #textColor for: #ThreePhaseButtonMorph from: #PluggableButtonMorph.! Item was changed: ----- Method: SqueakTheme class>>addDialogs: (in category 'instance creation') ----- addDialogs: theme "self create apply." theme set: #borderColor for: #DialogWindow to: Color gray; set: #borderWidth for: #DialogWindow to: 1; + set: #borderStyle for: #DialogWindow to: BorderStyle simple; - set: #borderStyle for: #DialogWindow to: BorderStyle default; set: #color for: #DialogWindow to: Color white; set: #titleBorderColor for: #DialogWindow to: Color gray; set: #titleBorderWidth for: #DialogWindow to: 0; set: #titleBorderStyle for: #DialogWindow to: BorderStyle default; set: #titleColor for: #DialogWindow to: (Color r: 0.658 g: 0.678 b: 0.78); set: #titleFont for: #DialogWindow to: [Preferences windowTitleFont]; set: #titleTextColor for: #DialogWindow to: Color black; set: #font for: #DialogWindow to: [Preferences standardSystemFont]; set: #textColor for: #DialogWindow to: Color black; set: #okColor for: #DialogWindow to: (Color r: 0.49 g: 0.749 b: 0.49); set: #cancelColor for: #DialogWindow to: (Color r: 1 g: 0.6 b: 0.588); set: #buttonColor for: #DialogWindow to: (Color r: 0.658 g: 0.678 b: 0.78) twiceLighter; set: #selectionModifier for: #DialogWindow to: [ [:c | Color orange muchLighter ] ]. "The List Chooser is a dialog, too." theme derive: #okColor for: #ListChooser from: #DialogWindow; derive: #cancelColor for: #ListChooser from: #DialogWindow; set: #addColor for: #ListChooser to: Color blue muchLighter; set: #disabledColor for: #ListChooser to: Color gray. "And the mulitple list chooser." theme derive: #okColor for: #ListMultipleChooser from: #DialogWindow; derive: #cancelColor for: #ListMultipleChooser from: #DialogWindow. "And the system progress bar." theme derive: #borderColor for: #SystemProgressMorph from: #MenuMorph; derive: #borderWidth for: #SystemProgressMorph from: #MenuMorph; derive: #borderStyle for: #SystemProgressMorph from: #MenuMorph; derive: #color for: #SystemProgressMorph from: #MenuMorph; derive: #font for: #SystemProgressMorph from: #MenuItemMorph; derive: #textColor for: #SystemProgressMorph from: #MenuItemMorph; set: #borderColor for: #SystemProgressBarMorph to: Color transparent; set: #borderWidth for: #SystemProgressBarMorph to: 0; set: #borderStyle for: #SystemProgressBarMorph to: BorderStyle default; set: #color for: #SystemProgressBarMorph to: (Color r: 0.977 g: 0.977 b: 0.977); set: #barColor for: #SystemProgressBarMorph to: (Color r: 0.72 g: 0.72 b: 0.9). "And the balloon morphs." theme set: #borderColor for: #NewBalloonMorph to: (Color r: 0.46 g: 0.46 b: 0.353); set: #borderWidth for: #NewBalloonMorph to: 1; set: #color for: #NewBalloonMorph to:(Color r: 0.92 g: 0.92 b: 0.706); set: #font for: #NewBalloonMorph to: [Preferences standardBalloonHelpFont]; derive: #textColor for: #NewBalloonMorph from: #PluggableButtonMorph. theme derive: #borderColor for: #BalloonMorph from: #NewBalloonMorph; set: #borderWidth for: #BalloonMorph to: 0; derive: #color for: #BalloonMorph from: #NewBalloonMorph; derive: #font for: #BalloonMorph from: #NewBalloonMorph; derive: #textColor for: #BalloonMorph from: #NewBalloonMorph. "And the transfer morphs." theme derive: #borderColor for: #TransferMorph from: #NewBalloonMorph; derive: #borderWidth for: #TransferMorph from: #NewBalloonMorph; derive: #color for: #TransferMorph from: #NewBalloonMorph; derive: #font for: #TransferMorph from: #NewBalloonMorph; derive: #textColor for: #TransferMorph from: #NewBalloonMorph. ! Item was changed: ----- Method: SqueakTheme class>>addMenusAndDockingBars: (in category 'instance creation') ----- addMenusAndDockingBars: theme theme set: #borderColor for: #MenuMorph to: Color gray; set: #borderWidth for: #MenuMorph to: 1; + set: #borderStyle for: #MenuMorph to: BorderStyle simple; - set: #borderStyle for: #MenuMorph to: BorderStyle default; set: #color for: #MenuMorph to: (Color gray: 0.9); set: #titleBorderColor for: #MenuMorph to: (Color r: 0.6 g: 0.7 b: 1); set: #titleBorderWidth for: #MenuMorph to: 0; + set: #titleBorderStyle for: #MenuMorph to: BorderStyle simple; - set: #titleBorderStyle for: #MenuMorph to: BorderStyle default; set: #titleColor for: #MenuMorph to: Color transparent; set: #titleFont for: #MenuMorph to: [Preferences windowTitleFont]; set: #titleTextColor for: #MenuMorph to: Color black; set: #lineColor for: #MenuMorph to: (Color gray: 0.9); set: #lineStyle for: #MenuMorph to: BorderStyle inset; set: #lineWidth for: #MenuMorph to: 2. theme set: #font for: #MenuItemMorph to: [Preferences standardMenuFont]; set: #textColor for: #MenuItemMorph to: Color black; set: #disabledTextColor for: #MenuItemMorph to: Color gray; set: #selectionColor for: #MenuItemMorph to: (Color r: 0.4 g: 0.5 b: 0.7); set: #selectionTextColor for: #MenuItemMorph to: Color white. "Derive some stuff for the docking bar morph, which looks mostly like a menu morph." theme set: #borderWidth for: #DockingBarMorph to: 0; derive: #borderColor for: #DockingBarMorph from: #MenuMorph; derive: #borderStyle for: #DockingBarMorph from: #MenuMorph; derive: #color for: #DockingBarMorph from: #MenuMorph; derive: #lineColor for: #DockingBarMorph from: #MenuMorph; derive: #lineStyle for: #DockingBarMorph from: #MenuMorph; derive: #lineWidth for: #DockingBarMorph from: #MenuMorph. "The world main docking bar." theme derive: #font for: #TheWorldMainDockingBar from: #MenuItemMorph; derive: #textColor for: #TheWorldMainDockingBar from: #MenuItemMorph; set: #logoColor for: #TheWorldMainDockingBar to: Color black; set: #selectionLogoColor for: #TheWorldMainDockingBar to: Color white.! Item was changed: ----- Method: SqueakTheme class>>addScrollables: (in category 'instance creation') ----- addScrollables: theme "self create apply" "Sliders" theme set: #borderColor for: #Slider to: Color gray; set: #borderWidth for: #Slider to: 1; set: #color for: #Slider to: Color lightGray; set: #thumbBorderColor for: #Slider to: [Color gray: 0.6]; set: #thumbBorderWidth for: #Slider to: 0; set: #thumbColor for: #Slider to: Color veryVeryLightGray; set: #thumbShadowModifier for: #Slider to: [ [:c | c alpha: 0.7] ]. "Scroll bars" theme set: #thumbBorderWidth for: #ScrollBar to: 1; set: #thumbColorModifier for: #ScrollBar to: [ [:c | c] ]; set: #pagingAreaColorModifier for: #ScrollBar to: [ [:c | c darker alpha: 0.35] ]; set: #borderColorModifier for: #ScrollBar to: [ [:c | c adjustBrightness: -0.3] ]. "Scroll panes (includes generic stuff for list widgets, tree widgets, and text widgets." theme set: #borderColor for: #ScrollPane to: (Color gray: 0.6); set: #borderWidth for: #ScrollPane to: 1; + set: #borderStyle for: #ScrollPane to: BorderStyle simple; - set: #borderStyle for: #ScrollPane to: BorderStyle default; set: #color for: #ScrollPane to: Color white. "List widgets" theme set: #font for: #PluggableListMorph to: [Preferences standardListFont]; set: #textColor for: #PluggableListMorph to: Color black; set: #selectionColor for: #PluggableListMorph to: (Color r: 0.72 g: 0.72 b: 0.9); derive: #multiSelectionColor for: #PluggableListMorph from: #PluggableListMorph at: #selectionColor do: [:c | c lighter]; set: #selectionTextColor for: #PluggableListMorph to: Color black; set: #filterColor for: #PluggableListMorph to: Color yellow paler; set: #filterTextColor for: #PluggableListMorph to: Color black; set: #preSelectionModifier for: #PluggableListMorph to: [ [:c | Color gray: 0.9] ]; set: #hoverSelectionModifier for: #PluggableListMorph to: [ [:c | c darker alpha: 0.3] ]. "Tree widgets" theme derive: #font for: #SimpleHierarchicalListMorph from: #PluggableListMorph; derive: #textColor for: #SimpleHierarchicalListMorph from: #PluggableListMorph; derive: #selectionColor for: #SimpleHierarchicalListMorph from: #PluggableListMorph; derive: #selectionTextColor for: #SimpleHierarchicalListMorph from: #PluggableListMorph; derive: #filterColor for: #SimpleHierarchicalListMorph from: #PluggableListMorph; derive: #filterTextColor for: #SimpleHierarchicalListMorph from: #PluggableListMorph; derive: #hoverSelectionModifier for: #SimpleHierarchicalListMorph from: #PluggableListMorph; set: #higlightTextColor for: #SimpleHierarchicalListMorph to: Color red; set: #lineColor for: #SimpleHierarchicalListMorph to: Color veryLightGray. "Text widgets" theme set: #font for: #PluggableTextMorph to: [Preferences standardSystemFont]; set: #textColor for: #PluggableTextMorph to: Color black; set: #caretColor for: #PluggableTextMorph to: Color red; set: #selectionColor for: #PluggableTextMorph to: (TranslucentColor r: 0.0 g: 0.0 b: 0.8 alpha: 0.2); set: #unfocusedSelectionModifier for: #PluggableTextMorph to: [ [:c | Color gray: 0.9] ]; set: #adornmentReadOnly for: #PluggableTextMorph to: Color black; set: #adornmentRefuse for: #PluggableTextMorph to: Color tan; set: #adornmentConflict for: #PluggableTextMorph to: Color red; set: #adornmentDiff for: #PluggableTextMorph to: Color green; set: #adornmentNormalEdit for: #PluggableTextMorph to: Color orange; set: #adornmentDiffEdit for: #PluggableTextMorph to: Color yellow; set: #frameAdornmentWidth for: #PluggableTextMorph to: 1. theme set: #balloonTextColor for: #PluggableTextMorphPlus to: (Color gray: 0.7); derive: #balloonTextFont for: #PluggableTextMorphPlus from: #PluggableTextMorph at: #font.! Item was changed: ----- Method: SqueakTheme class>>addToolColors: (in category 'instance creation') ----- addToolColors: theme "Tool-specific colors." "SUnit's TestRunner." theme set: #failureColor for: #TestRunner to: Color yellow; set: #errorColor for: #TestRunner to: Color red; set: #passColor for: #TestRunner to: Color green; derive: #failureTextColor for: #TestRunner from: #PluggableTextMorph at: #textColor; derive: #errorTextColor for: #TestRunner from: #PluggableTextMorph at: #textColor; derive: #passTextColor for: #TestRunner from: #PluggableTextMorph at: #textColor. "Monticello Tools." theme set: #revertedOperationAttributes for: #MCOperationsBrowser to: {TextEmphasis struckOut}; set: #ignoredOperationAttributes for: #MCOperationsBrowser to: {TextColor color: Color gray}. "set: #rejectedOperationAttributes for: #MCOperationsBrowser to: {TextEmphasis struckOut}; set: #acceptedOperationAttributes for: #MCOperationsBrowser to: {TextEmphasis underlined}; set: #conflictingOperationAttributes for: #MCOperationsBrowser to: {TextEmphasis bold}." "Halos." theme derive: #borderColor for: #HaloMorph from: #MenuItemMorph at: #selectionColor do: [:c | c alpha: 0.8]; derive: #borderColor for: #SelectionMorph from: #MenuItemMorph at: #selectionColor do: [:c | c twiceDarker alpha: 0.75]; derive: #color for: #SelectionMorph from: #MenuItemMorph at: #selectionColor do: [:c | c alpha: 0.08]. "Browser." + theme set: #noClassCommentColor for: #Browser to: Color red. + + "Objects Tool." + theme + derive: #borderWidth for: #ObjectsTool from: #MenuMorph; + derive: #borderColor for: #ObjectsTool from: #MenuMorph; + derive: #borderStyle for: #ObjectsTool from: #MenuMorph; + derive: #color for: #ObjectsTool from: #MenuMorph.! - theme set: #noClassCommentColor for: #Browser to: Color red.! Item was changed: ----- Method: TrimTheme class>>addButtons: (in category 'instance creation') ----- addButtons: theme theme set: #borderColor for: #PluggableButtonMorph to: self gray102; set: #borderWidth for: #PluggableButtonMorph to: 1; + set: #borderStyle for: #PluggableButtonMorph to: BorderStyle simple; - set: #borderStyle for: #PluggableButtonMorph to: BorderStyle default; set: #color for: #PluggableButtonMorph to: self gray76; set: #textColor for: #PluggableButtonMorph to: self white; set: #selectionModifier for: #PluggableButtonMorph to: [ [:c | self gray39] ]; set: #hoverModifier for: #PluggableButtonMorph to: [ [:c | self gray51] ]; set: #feedbackModifier for: #PluggableButtonMorph to: [ [:c | self gray39] ]. "And the plus-version." theme set: #disabledColor for: #PluggableButtonMorphPlus to: Color transparent; set: #disabledTextColor for: #PluggableButtonMorphPlus to: self gray128.! Item was changed: ----- Method: TrimTheme class>>addDialogs: (in category 'instance creation') ----- addDialogs: theme "self create apply." theme set: #borderColor for: #DialogWindow to: self gray59; set: #borderWidth for: #DialogWindow to: 0; + set: #borderStyle for: #DialogWindow to: BorderStyle simple; - set: #borderStyle for: #DialogWindow to: BorderStyle default; set: #color for: #DialogWindow to: self gray64; set: #titleBorderColor for: #DialogWindow to: self gray59; set: #titleBorderWidth for: #DialogWindow to: 0; + set: #titleBorderStyle for: #DialogWindow to: BorderStyle simple; - set: #titleBorderStyle for: #DialogWindow to: BorderStyle default; set: #titleColor for: #DialogWindow to: self gray51; set: #titleTextColor for: #DialogWindow to: self white; set: #textColor for: #DialogWindow to: self white; set: #okColor for: #DialogWindow to: self green; set: #cancelColor for: #DialogWindow to: self red; set: #buttonColor for: #DialogWindow to: self gray59; set: #selectionModifier for: #DialogWindow to: [ [:c | self blue ] ]. "The List Chooser is a dialog, too." theme set: #addColor for: #ListChooser to: self yellow; set: #disabledColor for: #ListChooser to: Color transparent. "And the system progress bar." theme set: #borderColor for: #SystemProgressBarMorph to: Color transparent; set: #borderWidth for: #SystemProgressBarMorph to: 0; + set: #borderStyle for: #SystemProgressBarMorph to: BorderStyle simple; - set: #borderStyle for: #SystemProgressBarMorph to: BorderStyle default; set: #color for: #SystemProgressBarMorph to: self gray64; set: #barColor for: #SystemProgressBarMorph to: self blue. "And the balloon morphs." theme set: #borderColor for: #NewBalloonMorph to: self gray168; set: #borderWidth for: #NewBalloonMorph to: 1; set: #color for: #NewBalloonMorph to: self gray102; set: #textColor for: #NewBalloonMorph to: self white.! Item was changed: ----- Method: TrimTheme class>>addMenusAndDockingBars: (in category 'instance creation') ----- addMenusAndDockingBars: theme theme set: #borderColor for: #MenuMorph to: self gray51; set: #borderWidth for: #MenuMorph to: 1; + set: #borderStyle for: #MenuMorph to: BorderStyle simple; - set: #borderStyle for: #MenuMorph to: BorderStyle default; set: #color for: #MenuMorph to: self gray27; set: #titleBorderColor for: #MenuMorph to: (Color r: 0.6 g: 0.7 b: 1); set: #titleBorderWidth for: #MenuMorph to: 0; + set: #titleBorderStyle for: #MenuMorph to: BorderStyle simple; - set: #titleBorderStyle for: #MenuMorph to: BorderStyle default; set: #titleColor for: #MenuMorph to: Color transparent; set: #titleTextColor for: #MenuMorph to: self white; set: #lineColor for: #MenuMorph to: self gray51; set: #lineStyle for: #MenuMorph to: BorderStyle simple; set: #lineWidth for: #MenuMorph to: 1. theme set: #textColor for: #MenuItemMorph to: self white; set: #disabledTextColor for: #MenuItemMorph to: self gray128; set: #selectionColor for: #MenuItemMorph to: self gray102; set: #selectionTextColor for: #MenuItemMorph to: self white. "The world main docking bar." theme set: #logoColor for: #TheWorldMainDockingBar to: self white; set: #selectionLogoColor for: #TheWorldMainDockingBar to: self white.! Item was changed: ----- Method: TrimTheme class>>addScrollables: (in category 'instance creation') ----- addScrollables: theme "self create apply" "Sliders" theme set: #borderColor for: #Slider to: self gray76; set: #borderWidth for: #Slider to: 1; set: #color for: #Slider to: self gray61; set: #thumbBorderColor for: #Slider to: self gray61; set: #thumbBorderWidth for: #Slider to: 1; set: #thumbColor for: #Slider to: self gray128; set: #thumbShadowModifier for: #Slider to: [ [:c | c alpha: 0.7] ]. "Scroll bars" theme set: #thumbBorderWidth for: #ScrollBar to: 1; set: #thumbColorModifier for: #ScrollBar to: [ [:c | c adjustBrightness: 0.2] ]; "set: #pagingAreaColorModifier for: #ScrollBar to: [ [:c | self gray51] ];" set: #borderColorModifier for: #ScrollBar to: [ [:c | c adjustBrightness: 0.2] ]. "Scroll panes (includes generic stuff for list widgets, tree widgets, and text widgets." theme set: #borderColor for: #ScrollPane to: self gray76; set: #borderWidth for: #ScrollPane to: 1; + set: #borderStyle for: #ScrollPane to: BorderStyle simple; - set: #borderStyle for: #ScrollPane to: BorderStyle default; set: #color for: #ScrollPane to: self gray51. "List widgets" theme set: #textColor for: #PluggableListMorph to: self white; set: #selectionColor for: #PluggableListMorph to: self blue; derive: #multiSelectionColor for: #PluggableListMorph from: #PluggableListMorph at: #selectionColor do: [:c | c lighter]; set: #selectionTextColor for: #PluggableListMorph to: self white; set: #filterColor for: #PluggableListMorph to: self orange; set: #filterTextColor for: #PluggableListMorph to: self white; set: #preSelectionModifier for: #PluggableListMorph to: [ [:c | c alpha: 0.3] ]; set: #hoverSelectionModifier for: #PluggableListMorph to: [ [:c | c darker alpha: 0.3] ]. "Tree widgets" theme set: #higlightTextColor for: #SimpleHierarchicalListMorph to: self red; set: #lineColor for: #SimpleHierarchicalListMorph to: self gray168. "Text widgets" theme set: #textColor for: #PluggableTextMorph to: self white; set: #caretColor for: #PluggableTextMorph to: self white; set: #selectionColor for: #PluggableTextMorph to: (self blue alpha: 0.4); set: #unfocusedSelectionModifier for: #PluggableTextMorph to: [ [:c | self blue alpha: 0.3] ]; set: #adornmentReadOnly for: #PluggableTextMorph to: self black; set: #adornmentRefuse for: #PluggableTextMorph to: self blue; set: #adornmentConflict for: #PluggableTextMorph to: self red; set: #adornmentDiff for: #PluggableTextMorph to: self green; set: #adornmentNormalEdit for: #PluggableTextMorph to: self orange; set: #adornmentDiffEdit for: #PluggableTextMorph to: self yellow; set: #frameAdornmentWidth for: #PluggableTextMorph to: 1. theme set: #balloonTextColor for: #PluggableTextMorphPlus to: self gray102.! Item was changed: + (PackageInfo named: 'System') postscript: 'UserInterfaceTheme cleanUp: true. + (UserInterfaceTheme named: UserInterfaceTheme current name) apply.'! - (PackageInfo named: 'System') postscript: '"Ensure that only classes are stored in the SoundService app registry." - SoundService default: SoundService defaultOrNil.'!

1 0

Jump to page: