Packages May 2018

packages@lists.squeakfoundation.org

1 participants
110 discussions

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

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

06 May '18

Marcel Taeumel uploaded a new version of 60Deprecated to project The Trunk: http://source.squeak.org/trunk/60Deprecated-mt.18.mcz ==================== Summary ==================== Name: 60Deprecated-mt.18 Author: mt Time: 6 May 2018, 3:04:54.850836 pm UUID: c3fb6f9b-652f-c640-a2d9-61e690ffe944 Ancestors: 60Deprecated-pre.17 Supplement to refactoring in Morphic-mt.1427. =============== Diff against 60Deprecated-pre.17 =============== Item was added: + ----- Method: BorderStyle>>colorsAtCorners (in category '*60Deprecated-accessing') ----- + colorsAtCorners + + self deprecated: 'See #topLeftColor and #bottomRightColor.'. + ^Array new: 4 withAll: self color! Item was added: + ----- Method: BorderStyle>>dotOfSize:forDirection: (in category '*60Deprecated-accessing') ----- + dotOfSize: diameter forDirection: aDirection + + self deprecated: 'See Form for such convenience functions.'. + ^ Form dotOfSize: diameter color: self color! Item was added: + ----- Method: BorderStyle>>widthForRounding (in category '*60Deprecated-accessing') ----- + widthForRounding + + self deprecated: 'See BalloonCanvas for drawing rounded corners.'. + ^self width! Item was added: + ----- Method: BorderedMorph>>doesBevels (in category '*60Deprecated-accessing') ----- + doesBevels + "To return true means that this object can show bevelled borders, and + therefore can accept, eg, #raised or #inset as valid borderColors. + Must be overridden by subclasses that do not support bevelled borders." + + self deprecated: 'Use border styles such as InsetBorder or RaisedBorder.'. + ^ false! Item was added: + ----- Method: ComplexBorder>>widthForRounding (in category '*60Deprecated-accessing') ----- + widthForRounding + + self deprecated: 'See BalloonCanvas for drawing rounded corners.'. + ^0! Item was added: + ----- Method: EllipseMorph>>doesBevels (in category '*60Deprecated-accessing') ----- + doesBevels + self deprecated: 'Use border styles such as InsetBorder or RaisedBorder.'. + ^ false! Item was added: + ----- Method: InsetBorder>>colorsAtCorners (in category '*60Deprecated-accessing') ----- + colorsAtCorners + + | c c14 c23 | + self deprecated: 'See #topLeftColor and #bottomRightColor.'. + + c := self color. + c14 := c lighter. c23 := c darker. + ^Array with: c23 with: c14 with: c14 with: c23.! Item was added: + ----- Method: Morph>>doesBevels (in category '*60Deprecated-accessing') ----- + doesBevels + "To return true means that this object can show bevelled borders, and + therefore can accept, eg, #raised or #inset as valid borderColors. + Must be overridden by subclasses that do not support bevelled borders." + + self deprecated: 'Use border styles such as InsetBorder or RaisedBorder.'. + ^ false! Item was added: + ----- Method: RaisedBorder>>colorsAtCorners (in category '*60Deprecated-accessing') ----- + colorsAtCorners + + | c c14 c23 | + self deprecated: 'See #topLeftColor and #bottomRightColor.'. + c := self color. + c14 := c lighter. c23 := c darker. + ^Array with: c14 with: c23 with: c23 with: c14! Item was added: + ----- Method: TTSampleFontMorph>>doesBevels (in category '*60Deprecated-accessing') ----- + doesBevels + self deprecated: 'Use border styles such as InsetBorder or RaisedBorder.'. + ^ false!

1 0

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

06 May '18

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.1427.mcz ==================== Summary ==================== Name: Morphic-mt.1427 Author: mt Time: 6 May 2018, 3:03:37.219836 pm UUID: 5d8b170c-c236-574f-b8e6-b541ccf29d48 Ancestors: Morphic-mt.1426 Refactoring of BorderedMorph to make use of BorderStyle like regular morphs do. Maybe, in the future, we can get rid of BorderedMorph. It covers: - No instVar access to borderColor and borderWidth but message sends. - No #inset or #raised anymore when asking a morph for its #borderColor. Just colors. - Copying the prototypical border styles from the UI theme when used in morphs. - A post-load script that updates all your morphs in the image. Not that important but good for keeping your current tools opened. Note that there is no support for rounded raised/inset boarders at the moment. =============== Diff against Morphic-mt.1426 =============== Item was changed: ----- Method: BorderStyle class>>borderStyleForSymbol: (in category 'instance creation') ----- borderStyleForSymbol: sym "Answer a border style corresponding to the given symbol" | aSymbol | aSymbol := sym == #none ifTrue: [#simple] ifFalse: [sym]. + ^ (self borderStyleChoices includes: aSymbol) + ifTrue: [self perform: aSymbol] + ifFalse: [nil] - ^ self perform: aSymbol " | aSymbol selector | aSymbol := sym == #none ifTrue: [#simple] ifFalse: [sym]. selector := Vocabulary eToyVocabulary translationKeyFor: aSymbol. selector isNil ifTrue: [selector := aSymbol]. ^ self perform: selector " ! Item was removed: - ----- Method: BorderStyle>>colorsAtCorners (in category 'accessing') ----- - colorsAtCorners - ^Array new: 4 withAll: self color! Item was removed: - ----- Method: BorderStyle>>dotOfSize:forDirection: (in category 'accessing') ----- - dotOfSize: diameter forDirection: aDirection - | form | - form := Form extent: diameter@diameter depth: Display depth. - form getCanvas fillOval: form boundingBox color: self color. - ^form! Item was removed: - ----- Method: BorderStyle>>widthForRounding (in category 'accessing') ----- - widthForRounding - ^self width! Item was changed: ----- Method: BorderedMorph>>acquireBorderWidth: (in category 'geometry') ----- acquireBorderWidth: aBorderWidth "Gracefully acquire the new border width, keeping the interior area intact and not seeming to shift" | delta | (delta := aBorderWidth- self borderWidth) = 0 ifTrue: [^ self]. self bounds: ((self bounds origin - (delta @ delta)) corner: (self bounds corner + (delta @ delta))). + self borderWidth: aBorderWidth.! - self borderWidth: aBorderWidth. - self layoutChanged! Item was removed: - ----- Method: BorderedMorph>>borderColor (in category 'accessing') ----- - borderColor - ^ borderColor! Item was changed: ----- Method: BorderedMorph>>borderColor: (in category 'accessing') ----- + borderColor: aColorOrSymbolOrNil + + super borderColor: aColorOrSymbolOrNil. + + self flag: #compatibility. "mt: For older code, update the instance variables. Should be removed in the future." + borderColor := self borderStyle color.! - borderColor: colorOrSymbolOrNil - self doesBevels ifFalse:[ - colorOrSymbolOrNil isColor ifFalse:[^self]]. - borderColor = colorOrSymbolOrNil ifFalse: [ - borderColor := colorOrSymbolOrNil. - self changed]. - ! Item was changed: ----- Method: BorderedMorph>>borderInitialize (in category 'initialization') ----- borderInitialize "initialize the receiver state related to border" + + self borderStyle: ( + self defaultBorderStyle + baseColor: self defaultBorderColor; + width: self defaultBorderWidth; + trackColorFrom: self; + yourself).! - borderColor:= self defaultBorderColor. - borderWidth := self defaultBorderWidth! Item was changed: + ----- Method: BorderedMorph>>borderInset (in category 'initialization') ----- - ----- Method: BorderedMorph>>borderInset (in category 'accessing') ----- borderInset + "Change border to inset. Preserve width and color." + + self borderStyle: ( + BorderStyle inset + width: self borderStyle width; + baseColor: Color transparent; + trackColorFrom: self; + yourself).! - self borderColor: #inset! Item was changed: + ----- Method: BorderedMorph>>borderRaised (in category 'initialization') ----- - ----- Method: BorderedMorph>>borderRaised (in category 'accessing') ----- borderRaised + "Change border to inset. Preserve width and color." + + self borderStyle: ( + BorderStyle raised + width: self borderStyle width; + baseColor: Color transparent; + trackColorFrom: self; + yourself).! - self borderColor: #raised! Item was added: + ----- Method: BorderedMorph>>borderSimple (in category 'initialization') ----- + borderSimple + "Change border to simple. Preserve width and color." + + self borderStyle: ( + BorderStyle simple + width: self borderStyle width; + baseColor: self borderStyle color; "Override any raised/inset specials." + trackColorFrom: self; + yourself).! Item was removed: - ----- Method: BorderedMorph>>borderStyle (in category 'accessing') ----- - borderStyle - "Work around the borderWidth/borderColor pair" - - | style | - borderColor ifNil: [^BorderStyle default]. - borderWidth isZero ifTrue: [^BorderStyle default]. - style := self valueOfProperty: #borderStyle ifAbsent: [BorderStyle default]. - (borderWidth = style width and: - ["Hah!! Try understanding this..." - - borderColor == style style or: - ["#raised/#inset etc" - - #simple == style style and: [borderColor = style color]]]) - ifFalse: - [style := borderColor isColor - ifTrue: [BorderStyle width: borderWidth color: borderColor] - ifFalse: [(BorderStyle perform: borderColor) width: borderWidth "argh."]. - self setProperty: #borderStyle toValue: style]. - ^style trackColorFrom: self! Item was changed: ----- Method: BorderedMorph>>borderStyle: (in category 'accessing') ----- borderStyle: aBorderStyle - "Work around the borderWidth/borderColor pair" + super borderStyle: aBorderStyle. - aBorderStyle = self borderStyle ifTrue: [^self]. - "secure against invalid border styles" - (self canDrawBorder: aBorderStyle) - ifFalse: - ["Replace the suggested border with a simple one" + self flag: #compatibility. "mt: For older code, update the instance variables. Should be removed in the future." - ^self borderStyle: (BorderStyle width: aBorderStyle width - color: (aBorderStyle trackColorFrom: self) color)]. - aBorderStyle width = self borderStyle width ifFalse: [self changed]. - (aBorderStyle isNil or: [aBorderStyle == BorderStyle default]) - ifTrue: - [self removeProperty: #borderStyle. - borderWidth := 0. - ^self changed]. - self setProperty: #borderStyle toValue: aBorderStyle. borderWidth := aBorderStyle width. + borderColor := aBorderStyle color.! - borderColor := aBorderStyle style == #simple - ifTrue: [aBorderStyle color] - ifFalse: [aBorderStyle style]. - self changed! Item was removed: - ----- Method: BorderedMorph>>borderWidth (in category 'accessing') ----- - borderWidth - ^ borderWidth! Item was changed: ----- Method: BorderedMorph>>borderWidth: (in category 'accessing') ----- borderWidth: anInteger + + super borderWidth: anInteger. + + self flag: #compatibility. "mt: For older code, update the instance variables. Should be removed in the future." + borderWidth := self borderStyle width.! - borderColor ifNil: [borderColor := Color black]. - borderWidth := anInteger max: 0. - self changed! Item was changed: ----- Method: BorderedMorph>>changeBorderWidth: (in category 'menu') ----- changeBorderWidth: evt | handle origin aHand newWidth oldWidth | aHand := evt ifNil: [self primaryHand] ifNotNil: [evt hand]. origin := aHand position. + oldWidth := self borderWidth. - oldWidth := borderWidth. (handle := HandleMorph new) forEachPointDo: [:newPoint | handle removeAllMorphs. handle addMorph: (LineMorph from: origin to: newPoint color: Color black width: 1). newWidth := (newPoint - origin) r asInteger // 5. self borderWidth: newWidth] lastPointDo: [:newPoint | handle deleteBalloon. self halo ifNotNil: [:halo | halo addHandles]. self rememberCommand: (Command new cmdWording: 'border change' translated; undoTarget: self selector: #borderWidth: argument: oldWidth; redoTarget: self selector: #borderWidth: argument: newWidth)]. aHand attachMorph: handle. handle setProperty: #helpAtCenter toValue: true. handle showBalloon: 'Move cursor farther from this point to increase border width. Click when done.' translated hand: evt hand. handle startStepping! Item was added: + ----- Method: BorderedMorph>>defaultBorderStyle (in category 'initialization') ----- + defaultBorderStyle + ^ BorderStyle simple! Item was removed: - ----- Method: BorderedMorph>>doesBevels (in category 'accessing') ----- - doesBevels - "To return true means that this object can show bevelled borders, and - therefore can accept, eg, #raised or #inset as valid borderColors. - Must be overridden by subclasses that do not support bevelled borders." - - ^ true! Item was changed: ----- Method: BorderedMorph>>hasTranslucentColor (in category 'accessing') ----- hasTranslucentColor "Answer true if this any of this morph is translucent but not transparent." + (self color isColor and: [self color isTranslucentColor]) ifTrue: [^ true]. + (self borderColor isColor and: [self borderColor isTranslucentColor]) ifTrue: [^ true]. - (color isColor and: [color isTranslucentColor]) ifTrue: [^ true]. - (borderColor isColor and: [borderColor isTranslucentColor]) ifTrue: [^ true]. ^ false ! Item was changed: ----- Method: Canvas>>frameAndFillRoundRect:radius:fillStyle:borderStyle: (in category 'drawing-rectangles') ----- frameAndFillRoundRect: aRectangle radius: cornerRadius fillStyle: fillStyle borderStyle: borderStyle self + frameAndFillRoundRect: aRectangle + radius: cornerRadius + fillStyle: fillStyle asColor - frameAndFillRectangle: aRectangle - fillColor: fillStyle asColor borderWidth: borderStyle width borderColor: borderStyle color.! Item was added: + ----- Method: Canvas>>frameRoundRect:radius:borderStyle: (in category 'drawing-rectangles') ----- + frameRoundRect: aRectangle radius: radius borderStyle: borderStyle + + self + frameRoundRect: aRectangle + radius: radius + width: borderStyle width + color: borderStyle color.! Item was removed: - ----- Method: ComplexBorder>>widthForRounding (in category 'accessing') ----- - widthForRounding - ^0! Item was changed: ----- Method: DialogWindow>>setDefaultParameters (in category 'initialization') ----- setDefaultParameters "change the receiver's appareance parameters" self color: (self userInterfaceTheme color ifNil: [Color white]); + borderStyle: (self userInterfaceTheme borderStyle ifNil: [BorderStyle simple]) copy; - borderStyle: (self userInterfaceTheme borderStyle ifNil: [BorderStyle default]); borderColor: (self userInterfaceTheme borderColor ifNil: [Color gray]); borderWidth: (self userInterfaceTheme borderWidth ifNil: [1]); layoutInset: ((self class roundedDialogCorners and: [self class gradientDialog]) "This check compensates a bug in balloon." ifTrue: [0] ifFalse: [self borderWidth negated asPoint]). Preferences menuAppearance3d ifTrue: [self addDropShadow].! Item was changed: ----- Method: DialogWindow>>setTitleParameters (in category 'initialization') ----- setTitleParameters (self submorphNamed: #title) ifNotNil: [:title | title fillStyle: (self class gradientDialog ifFalse: [SolidFillStyle color: (self userInterfaceTheme titleColor ifNil: [Color r: 0.658 g: 0.678 b: 0.78])] ifTrue: [self titleGradientFor: title from: (self userInterfaceTheme titleColor ifNil: [Color r: 0.658 g: 0.678 b: 0.78])]); + borderStyle: (self userInterfaceTheme titleBorderStyle ifNil: [BorderStyle simple]) copy; - borderStyle: (self userInterfaceTheme titleBorderStyle ifNil: [BorderStyle default]); borderColor: (self userInterfaceTheme titleBorderColor ifNil: [Color r: 0.6 g: 0.7 b: 1]); borderWidth: (self userInterfaceTheme titleBorderWidth ifNil: [0]); cornerStyle: (self wantsRoundedCorners ifTrue: [#rounded] ifFalse: [#square]); vResizing: #shrinkWrap; hResizing: #spaceFill; wrapCentering: #center; cellPositioning: #center; cellInset: 0; layoutInset: (5@3 corner: 5@ (2+(self wantsRoundedCorners ifFalse: [0] ifTrue: [self cornerRadius])))]. titleMorph ifNotNil: [ | fontToUse colorToUse | fontToUse := self userInterfaceTheme titleFont ifNil: [TextStyle defaultFont]. colorToUse := self userInterfaceTheme titleTextColor ifNil: [Color black]. "Temporary HACK for 64-bit CI build. Can be removed in the future." titleMorph contents isText ifFalse: [^ self]. titleMorph contents addAttribute: (TextFontReference toFont: fontToUse); addAttribute: (TextColor color: colorToUse). titleMorph releaseParagraph; changed].! Item was changed: ----- Method: DockingBarMorph>>applyUserInterfaceTheme (in category 'update') ----- applyUserInterfaceTheme | colorToUse | gradientRamp := nil. super applyUserInterfaceTheme. self setDefaultParameters. "Update properties of separating lines." colorToUse := self userInterfaceTheme lineColor ifNil: [Color gray: 0.9]. self submorphs select: [:ea | ea knownName = #line] thenDo: [:line | line color: colorToUse; extent: (self userInterfaceTheme lineWidth ifNil: [2]) asPoint; + borderStyle: (self userInterfaceTheme lineStyle ifNil: [BorderStyle inset]) copy; - borderStyle: (self userInterfaceTheme lineStyle ifNil: [BorderStyle inset]); borderColor: colorToUse].! Item was changed: ----- Method: DockingBarMorph>>setDefaultParameters (in category 'initialize-release') ----- setDefaultParameters "private - set the default parameter using Preferences as the inspiration source" self color: (self userInterfaceTheme color ifNil: [Color r: 0.9 g: 0.9 b: 0.9]); + borderStyle: (self userInterfaceTheme borderStyle ifNil: [BorderStyle simple]) copy; - borderStyle: (self userInterfaceTheme borderStyle ifNil: [BorderStyle default]); borderColor: (self userInterfaceTheme borderColor ifNil: [Color gray]); borderWidth: (self userInterfaceTheme borderWidth ifNil: [0]). self extent: (Preferences standardMenuFont height asPoint).! Item was removed: - ----- Method: EllipseMorph>>doesBevels (in category 'accessing') ----- - doesBevels - ^ false! Item was changed: ----- Method: EllipseMorph>>drawOn: (in category 'drawing') ----- drawOn: aCanvas aCanvas isShadowDrawing + ifTrue: [^ aCanvas fillOval: self bounds fillStyle: self fillStyle borderWidth: 0 borderColor: nil]. + aCanvas fillOval: self bounds fillStyle: self fillStyle borderWidth: self borderWidth borderColor: self borderColor. - ifTrue: [^ aCanvas fillOval: bounds fillStyle: self fillStyle borderWidth: 0 borderColor: nil]. - aCanvas fillOval: bounds fillStyle: self fillStyle borderWidth: borderWidth borderColor: borderColor. ! Item was changed: ----- Method: GradientEditor>>initialize (in category 'initialization') ----- initialize super initialize. self myLayout. self extent: 500 @ 200. row := RectangleMorph new extent: self width @ 100; color: Color transparent; + borderStyle: BorderStyle inset. - borderColor: #inset. row addMorph: (gradientDisplay := GradientDisplayMorph new position: 20 @ 20; extent: self width - 40 @ 40). gradientDisplay fillStyle direction: gradientDisplay width @ 0. self addMorph: row. self addButtonRow. self addMorph: self colorRampExpressionMorph! Item was removed: - ----- Method: IconicButton>>borderInset (in category 'accessing') ----- - borderInset - self borderStyle: (BorderStyle inset width: 2).! Item was removed: - ----- Method: IconicButton>>borderRaised (in category 'accessing') ----- - borderRaised - self borderStyle: (BorderStyle raised width: 2).! Item was added: + ----- Method: IconicButton>>defaultBorderWidth (in category 'initialization') ----- + defaultBorderWidth + ^ 2! Item was changed: ----- Method: IconicButton>>labelGraphic: (in category 'as yet unclassified') ----- labelGraphic: aForm | oldLabel graphicalMorph | (oldLabel := self findA: SketchMorph) ifNotNil: [oldLabel delete]. graphicalMorph := SketchMorph withForm: aForm. + self extent: graphicalMorph extent + (self borderWidth + 6). - self extent: graphicalMorph extent + (borderWidth + 6). graphicalMorph position: self center - (graphicalMorph extent // 2). self addMorph: graphicalMorph. graphicalMorph baseGraphic; lock. ! Item was changed: ----- Method: InsetBorder>>bottomRightColor (in category 'accessing') ----- bottomRightColor + ^ color mixed: 0.65 with: Color white! - ^width = 1 - ifTrue: [color twiceLighter] - ifFalse: [color lighter]! Item was removed: - ----- Method: InsetBorder>>colorsAtCorners (in category 'accessing') ----- - colorsAtCorners - | c c14 c23 | - c := self color. - c14 := c lighter. c23 := c darker. - ^Array with: c23 with: c14 with: c14 with: c23.! Item was changed: ----- Method: InsetBorder>>topLeftColor (in category 'accessing') ----- topLeftColor + ^ color mixed: 0.70 with: Color black! - ^width = 1 - ifTrue: [color twiceDarker] - ifFalse: [color darker]! Item was changed: ----- Method: MenuMorph>>applyUserInterfaceTheme (in category 'update') ----- applyUserInterfaceTheme | colorToUse | super applyUserInterfaceTheme. self setDefaultParameters. "Update properties of separating lines." colorToUse := self userInterfaceTheme lineColor ifNil: [Color gray: 0.9]. self submorphs select: [:ea | ea knownName = #line] thenDo: [:line | line color: colorToUse; height: (self userInterfaceTheme lineWidth ifNil: [2]); + borderStyle: (self userInterfaceTheme lineStyle ifNil: [BorderStyle inset]) copy; - borderStyle: (self userInterfaceTheme lineStyle ifNil: [BorderStyle inset]); borderColor: colorToUse].! Item was changed: ----- Method: MenuMorph>>setDefaultParameters (in category 'initialization') ----- setDefaultParameters "change the receiver's appareance parameters" self color: (self userInterfaceTheme color ifNil: [Color r: 0.9 g: 0.9 b: 0.9]); + borderStyle: (self userInterfaceTheme borderStyle ifNil: [BorderStyle simple]) copy; - borderStyle: (self userInterfaceTheme borderStyle ifNil: [BorderStyle default]); borderColor: (self userInterfaceTheme borderColor ifNil: [Color gray]); borderWidth: (self userInterfaceTheme borderWidth ifNil: [1]). Preferences menuAppearance3d ifTrue: [self addDropShadow]. self layoutInset: 3. ! Item was changed: ----- Method: MenuMorph>>setTitleParametersFor: (in category 'initialization') ----- setTitleParametersFor: aMenuTitle aMenuTitle color: (self userInterfaceTheme titleColor ifNil: [Color transparent]); + borderStyle: (self userInterfaceTheme titleBorderStyle ifNil: [BorderStyle simple]) copy; - borderStyle: (self userInterfaceTheme titleBorderStyle ifNil: [BorderStyle default]); borderColor: (self userInterfaceTheme titleBorderColor ifNil: [Color r: 0.6 g: 0.7 b: 1]); borderWidth: (self userInterfaceTheme titleBorderWidth ifNil: [0]); cornerStyle: (self wantsRoundedCorners ifTrue: [#rounded] ifFalse: [#square]); vResizing: #shrinkWrap; wrapCentering: #center; cellPositioning: #center; cellInset: 5; layoutInset: (5@0 corner: 5@0).! Item was changed: ----- Method: Morph>>borderColor: (in category 'accessing') ----- borderColor: aColorOrSymbolOrNil - "Unfortunately, the argument to borderColor could be more than just a color. - It could also be a symbol, in which case it is to be interpreted as a style identifier. - But I might not be able to draw that kind of border, so it may have to be ignored. - Or it could be nil, in which case I should revert to the default border." + self flag: #compatibility. "mt: For old code. Should be removed in the future." + aColorOrSymbolOrNil + ifNil: [self borderStyle: nil] + ifNotNil: [:colorOrSymbol | + colorOrSymbol isSymbol ifTrue: [ + ^ self borderStyle: ((self borderStyleForSymbol: colorOrSymbol) + width: self borderStyle width; + baseColor: self borderStyle baseColor; + trackColorFrom: self; + yourself)]]. - | style newStyle | - style := self borderStyle. - style baseColor = aColorOrSymbolOrNil - ifTrue: [^ self]. + "Set the color of the current border style." + self borderStyle + baseColor: aColorOrSymbolOrNil; + trackColorFrom: self. - aColorOrSymbolOrNil isColor - ifTrue: [style style = #none "default border?" - ifTrue: [self borderStyle: (SimpleBorder width: 0 color: aColorOrSymbolOrNil)] - ifFalse: [style baseColor: aColorOrSymbolOrNil. - self changed]. - ^ self]. + self changed.! - self - borderStyle: ( ({ nil. #none } includes: aColorOrSymbolOrNil) - ifTrue: [BorderStyle default] - ifFalse: [ "a symbol" - self doesBevels ifFalse: [ ^self ]. - newStyle := (BorderStyle perform: aColorOrSymbolOrNil) - color: style color; - width: style width; - yourself. - (self canDrawBorder: newStyle) - ifTrue: [newStyle] - ifFalse: [style]])! Item was changed: ----- Method: Morph>>borderStyle (in category 'accessing') ----- borderStyle + ^ self valueOfProperty: #borderStyle ifAbsentPut: [BorderStyle default]! - ^(self valueOfProperty: #borderStyle ifAbsent:[BorderStyle default]) trackColorFrom: self! Item was changed: ----- Method: Morph>>borderStyle: (in category 'accessing') ----- + borderStyle: aBorderStyle + + aBorderStyle = self borderStyle ifTrue: [^ self]. + + "If we cannot draw the new border, accept at least its color and width." + ((self canDrawBorder: aBorderStyle) or: [aBorderStyle isNil]) + ifTrue: [self setProperty: #borderStyle toValue: aBorderStyle] + ifFalse: [ + self borderStyle + width: aBorderStyle width; + baseColor: aBorderStyle baseColor]. + + self borderStyle trackColorFrom: self. + + self + layoutChanged; + changed.! - borderStyle: newStyle - newStyle = self borderStyle ifFalse:[ - (self canDrawBorder: newStyle) ifFalse:[ - "Replace the suggested border with a simple one" - ^self borderStyle: (BorderStyle width: newStyle width color: (newStyle trackColorFrom: self) color)]. - self setProperty: #borderStyle toValue: newStyle. - self changed].! Item was changed: ----- Method: Morph>>borderStyleForSymbol: (in category 'accessing') ----- borderStyleForSymbol: aStyleSymbol "Answer a suitable BorderStyle for me of the type represented by a given symbol" + ^ (BorderStyle borderStyleForSymbol: aStyleSymbol asSymbol) + ifNotNil: [:style | | existing | + existing := self borderStyle. + style + width: existing width; + baseColor: existing baseColor; + trackColorFrom: self; + yourself]! - | aStyle existing | - aStyle := BorderStyle borderStyleForSymbol: aStyleSymbol asSymbol. - aStyle ifNil: [self error: 'bad style']. - existing := self borderStyle. - aStyle width: existing width; - baseColor: existing baseColor. - ^ (self canDrawBorder: aStyle) - ifTrue: - [aStyle] - ifFalse: - [nil]! Item was changed: ----- Method: Morph>>borderWidth: (in category 'accessing') ----- borderWidth: aNumber + "Sets the width of the border in the current border style. If there is no border yet, set up a simple one so that the user can actually see the border width." - | style | - style := self borderStyle. - style width = aNumber ifTrue: [ ^self ]. + self borderStyle width = aNumber ifTrue: [^ self]. + + self borderStyle style = #none + ifTrue: [^ self borderStyle: (BorderStyle simple width: aNumber; yourself)]. + + self borderStyle width: aNumber. + self layoutChanged; changed.! - style style = #none - ifTrue: [ self borderStyle: (SimpleBorder width: aNumber color: Color transparent) ] - ifFalse: [ style width: aNumber. self changed ]. - ! Item was changed: ----- Method: Morph>>color: (in category 'accessing') ----- color: aColor "Set the receiver's color. Directly set the color if appropriate, else go by way of fillStyle" (aColor isColor or: [aColor isKindOf: InfiniteForm]) ifFalse:[^ self fillStyle: aColor]. color = aColor ifFalse: [self removeProperty: #fillStyle. color := aColor. + self borderStyle trackColorFrom: self. self changed]! Item was removed: - ----- Method: Morph>>doesBevels (in category 'accessing') ----- - doesBevels - "To return true means that this object can show bevelled borders, and - therefore can accept, eg, #raised or #inset as valid borderColors. - Must be overridden by subclasses that do not support bevelled borders." - - ^ false! Item was changed: ----- Method: Morph>>drawOn: (in category 'drawing') ----- drawOn: aCanvas self wantsRoundedCorners + ifTrue: [aCanvas frameAndFillRoundRect: self bounds radius: self cornerRadius fillStyle: self fillStyle borderStyle: self borderStyle] - ifTrue: [aCanvas frameAndFillRoundRect: self bounds radius: self cornerRadius fillStyle: self fillStyle borderWidth: self borderStyle width borderColor: self borderStyle color] ifFalse: [aCanvas frameAndFillRectangle: self bounds fillStyle: self fillStyle borderStyle: self borderStyle]. ! Item was changed: ----- Method: Morph>>fillStyle: (in category 'visual properties') ----- fillStyle: aFillStyle "Set the current fillStyle of the receiver." self setProperty: #fillStyle toValue: aFillStyle. "Workaround for Morphs not yet converted" color := aFillStyle asColor. + self borderStyle trackColorFrom: self. self changed.! Item was changed: ----- Method: Morph>>setBorderStyle: (in category 'accessing') ----- setBorderStyle: aSymbol "Set the border style of my costume" + (self borderStyleForSymbol: aSymbol) + ifNotNil: [:style | self borderStyle: style].! - | aStyle | - aStyle := self borderStyleForSymbol: aSymbol. - aStyle ifNil: [^ self]. - (self canDrawBorder: aStyle) - ifTrue: - [self borderStyle: aStyle]! Item was changed: ----- Method: NewHandleMorph>>followHand:forEachPointDo:lastPointDo:withCursor: (in category 'all') ----- followHand: aHand forEachPointDo: block1 lastPointDo: block2 withCursor: aCursor + hand := aHand. hand showTemporaryCursor: aCursor "hotSpotOffset: aCursor offset negated". + - borderWidth := 0. color := Color transparent. pointBlock := block1. lastPointBlock := block2. + + self borderWidth: 0. self position: hand lastEvent cursorPoint - (self extent // 2)! Item was changed: ----- Method: PluggableButtonMorph>>setDefaultParameters (in category 'initialization') ----- setDefaultParameters "change the receiver's appareance parameters" self color: (self userInterfaceTheme color ifNil: [Color gray: 0.91]); + borderStyle: (self userInterfaceTheme borderStyle ifNil: [BorderStyle default]) copy; - borderStyle: (self userInterfaceTheme borderStyle ifNil: [BorderStyle default]); borderColor: (self userInterfaceTheme borderColor ifNil: [Color gray]); borderWidth: (self userInterfaceTheme borderWidth ifNil: [1]); font: (self userInterfaceTheme font ifNil: [TextStyle defaultFont]); textColor: (self userInterfaceTheme textColor ifNil: [Color black]). borderColor := self borderColor. self offColor: self color.! Item was changed: ----- Method: PolygonMorph>>arrowBoundsAt:from: (in category 'private') ----- arrowBoundsAt: endPoint from: priorPoint "Answer a triangle oriented along the line from priorPoint to endPoint." | d v angle wingBase arrowSpec length width | v := endPoint - priorPoint. angle := v degrees. + d := self borderWidth max: 1. - d := borderWidth max: 1. arrowSpec := self valueOfProperty: #arrowSpec ifAbsent: [5@4]. length := arrowSpec x abs. width := arrowSpec y abs. wingBase := endPoint + (Point r: d * length degrees: angle + 180.0). arrowSpec x >= 0 ifTrue: [^ { endPoint. wingBase + (Point r: d * width degrees: angle + 125.0). wingBase + (Point r: d * width degrees: angle - 125.0) }] ifFalse: ["Negative length means concave base." ^ { endPoint. wingBase + (Point r: d * width degrees: angle + 125.0). wingBase. wingBase + (Point r: d * width degrees: angle - 125.0) }]! Item was changed: + ----- Method: PolygonMorph>>borderColor: (in category 'accessing') ----- - ----- Method: PolygonMorph>>borderColor: (in category 'access') ----- borderColor: aColor + "Recompute fillForm and borderForm if translucency of border changes." + - super borderColor: aColor. - (borderColor isColor and: [borderColor isTranslucentColor]) - == (aColor isColor and: [aColor isTranslucentColor]) - ifFalse: - ["Need to recompute fillForm and borderForm - if translucency of border changes." + (self borderColor isColor and: [self borderColor isTranslucentColor]) + == (aColor isColor and: [aColor isTranslucentColor]) + ifFalse: [self releaseCachedState]! - self releaseCachedState]! Item was added: + ----- Method: PolygonMorph>>borderDashSpec (in category 'accessing') ----- + borderDashSpec + ^ borderDashSpec! Item was added: + ----- Method: PolygonMorph>>borderStyle: (in category 'accessing') ----- + borderStyle: aBorderStyle + + super borderStyle: aBorderStyle. + self computeBounds! Item was changed: ----- Method: PolygonMorph>>borderWidth: (in category 'accessing') ----- borderWidth: anInteger + super borderWidth: anInteger. - borderColor ifNil: [borderColor := Color black]. - borderWidth := anInteger max: 0. self computeBounds! Item was changed: ----- Method: PolygonMorph>>computeBounds (in category 'private') ----- computeBounds | oldBounds delta excludeHandles | + + self flag: #refactor. "mt: Make it lazy like all layout policies in Morph. See #fullBounds and #doLayoutIn:." + vertices ifNil: [^ self]. self changed. oldBounds := bounds. self releaseCachedState. bounds := self curveBounds expanded copy. self arrowForms do: [:f | bounds swallow: (f offset extent: f extent)]. handles ifNotNil: [self updateHandles]. "since we are directly updating bounds, see if any ordinary submorphs exist and move them accordingly" (oldBounds notNil and: [(delta := bounds origin - oldBounds origin) ~= (0@0)]) ifTrue: [ excludeHandles := IdentitySet new. handles ifNotNil: [excludeHandles addAll: handles]. self submorphsDo: [ :each | (excludeHandles includes: each) ifFalse: [ each position: each position + delta ]. ]. ]. self layoutChanged. self changed. ! Item was changed: ----- Method: PolygonMorph>>containsPoint: (in category 'geometry testing') ----- containsPoint: aPoint (super containsPoint: aPoint) ifFalse: [^ false]. closed & color isTransparent not ifTrue: + [^ (self filledForm pixelValueAt: aPoint - self topLeft + 1) > 0]. - [^ (self filledForm pixelValueAt: aPoint - bounds topLeft + 1) > 0]. self lineSegmentsDo: [:p1 :p2 | + (aPoint onLineFrom: p1 to: p2 within: (3 max: self borderWidth+1//2) asFloat) - (aPoint onLineFrom: p1 to: p2 within: (3 max: borderWidth+1//2) asFloat) ifTrue: [^ true]]. self arrowForms do: [:f | (f pixelValueAt: aPoint - f offset) > 0 ifTrue: [^ true]]. ^ false! Item was changed: ----- Method: PolygonMorph>>curveBounds (in category 'private') ----- curveBounds "Compute the bounds from actual curve traversal, with leeway for borderWidth. Also note the next-to-first and next-to-last points for arrow directions." "wiz - to avoid roundoff errors we return unrounded curvebounds." "we expect our receiver to take responsibility for approriate rounding adjustment." "hint: this is most likely 'self curveBounds expanded' " | pointAfterFirst pointBeforeLast oX oY cX cY | self isCurvy ifFalse: [^ (Rectangle encompassing: vertices) + expandBy: self borderWidth * 0.5 ]. - expandBy: borderWidth * 0.5 ]. curveState := nil. "Force recomputation" "curveBounds := vertices first corner: vertices last." pointAfterFirst := nil. self lineSegmentsDo: [:p1 :p2 | pointAfterFirst isNil ifTrue: [pointAfterFirst := p2 floor . oX := cX := p1 x. oY := cY := p1 y. ]. "curveBounds := curveBounds encompass: p2 ." oX:= oX min: p2 x. cX := cX max: p2 x. oY := oY min: p2 y. cY := cY max: p2 y. pointBeforeLast := p1 floor ]. curveState at: 2 put: pointAfterFirst. curveState at: 3 put: pointBeforeLast. + ^ ( oX @ oY corner: cX @ cY ) expandBy: self borderWidth * 0.5 ! - ^ ( oX @ oY corner: cX @ cY ) expandBy: borderWidth * 0.5 ! Item was changed: ----- Method: PolygonMorph>>drawArrowOn:at:from: (in category 'drawing') ----- drawArrowOn: aCanvas at: endPoint from: priorPoint "Draw a triangle oriented along the line from priorPoint to endPoint. Answer the wingBase." | pts spec wingBase | pts := self arrowBoundsAt: endPoint from: priorPoint. wingBase := pts size = 4 ifTrue: [pts third] ifFalse: [(pts copyFrom: 2 to: 3) average]. spec := self valueOfProperty: #arrowSpec ifAbsent: [5 @ 4]. spec x sign = spec y sign + ifTrue: [aCanvas drawPolygon: pts fillStyle: self borderColor] - ifTrue: [aCanvas drawPolygon: pts fillStyle: borderColor] ifFalse: [aCanvas drawPolygon: pts fillStyle: Color transparent + borderWidth: (self borderWidth + 1) // 2 + borderColor: self borderColor]. - borderWidth: (borderWidth + 1) // 2 - borderColor: borderColor]. ^wingBase! Item was changed: ----- Method: PolygonMorph>>drawArrowsOn: (in category 'drawing') ----- drawArrowsOn: aCanvas "Answer (possibly modified) endpoints for border drawing" "ArrowForms are computed only upon demand" | array | self hasArrows ifFalse: [^ #() ]. "Nothing to do" array := Array with: vertices first with: vertices last. "Prevent crashes for #raised or #inset borders" + self borderColor isColor - borderColor isColor ifFalse: [ ^array ]. (arrows == #forward or: [arrows == #both]) ifTrue: [ array at: 2 put: (self drawArrowOn: aCanvas at: vertices last from: self nextToLastPoint) ]. (arrows == #back or: [arrows == #both]) ifTrue: [ array at: 1 put: (self drawArrowOn: aCanvas at: vertices first from: self nextToFirstPoint) ]. ^array! Item was changed: ----- Method: PolygonMorph>>drawDashedBorderOn:usingEnds: (in category 'drawing') ----- drawDashedBorderOn: aCanvas usingEnds: anArray "Display my border on the canvas. NOTE: mostly copied from drawBorderOn:" | bevel topLeftColor bottomRightColor bigClipRect lineColor segmentOffset | + (self borderColor isNil + or: [self borderColor isColor + and: [self borderColor isTransparent]]) - (borderColor isNil - or: [borderColor isColor - and: [borderColor isTransparent]]) ifTrue: [^ self]. + lineColor := self borderColor. - lineColor := borderColor. bevel := false. "Border colors for bevelled effects depend on CW ordering of vertices" + self borderStyle style == #raised + ifTrue: [topLeftColor := self color lighter. + bottomRightColor := self color darker. - borderColor == #raised - ifTrue: [topLeftColor := color lighter. - bottomRightColor := color darker. bevel := true]. + self borderStyle style == #inset - borderColor == #inset ifTrue: [topLeftColor := owner colorForInsets darker. bottomRightColor := owner colorForInsets lighter. bevel := true]. bigClipRect := aCanvas clipRect expandBy: self borderWidth + 1 // 2. segmentOffset := self borderDashOffset. self lineSegmentsDo: [:p1 :p2 | | p1i p2i | p1i := p1 asIntegerPoint. p2i := p2 asIntegerPoint. self hasArrows ifTrue: ["Shorten line ends so as not to interfere with tip of arrow." ((arrows == #back or: [arrows == #both]) and: [p1 = vertices first]) ifTrue: [p1i := anArray first asIntegerPoint]. ((arrows == #forward or: [arrows == #both]) and: [p2 = vertices last]) ifTrue: [p2i := anArray last asIntegerPoint]]. (closed or: ["bigClipRect intersects: (p1i rect: p2i) optimized:" ((p1i min: p2i) max: bigClipRect origin) <= ((p1i max: p2i) min: bigClipRect corner)]) ifTrue: [bevel ifTrue: [lineColor := (p1i quadrantOf: p2i) > 2 ifTrue: [topLeftColor] ifFalse: [bottomRightColor]]. segmentOffset := aCanvas line: p1i to: p2i + width: self borderWidth - width: borderWidth color: lineColor + dashLength: self borderDashSpec first + secondColor: self borderDashSpec third + secondDashLength: self borderDashSpec second - dashLength: borderDashSpec first - secondColor: borderDashSpec third - secondDashLength: borderDashSpec second startingOffset: segmentOffset]]! Item was changed: ----- Method: PolygonMorph>>drawOnFormCanvas: (in category 'drawing') ----- drawOnFormCanvas: aCanvas "Display the receiver, a spline curve, approximated by straight line segments." | | vertices size < 1 ifTrue: [self error: 'a polygon must have at least one point']. closed & color isTransparent not + ifTrue: [aCanvas stencil: self filledForm at: self bounds topLeft - 1 color: self color]. + (self borderColor isColor and: [self borderColor isTranslucentColor]) + ifTrue: [aCanvas stencil: self borderForm at: self bounds topLeft + color: self borderColor] - ifTrue: [aCanvas stencil: self filledForm at: bounds topLeft - 1 color: color]. - (borderColor isColor and: [borderColor isTranslucentColor]) - ifTrue: [aCanvas stencil: self borderForm at: bounds topLeft - color: borderColor] ifFalse: [self drawBorderOn: aCanvas]. self arrowForms do: [:f | aCanvas stencil: f at: f offset + color: (self borderColor isColor ifTrue: [self borderColor] ifFalse: [self color])]! - color: (borderColor isColor ifTrue: [borderColor] ifFalse: [color])]! Item was changed: ----- Method: PolygonMorph>>filledForm (in category 'private') ----- filledForm "Note: The filled form is actually 2 pixels bigger than bounds, and the point corresponding to this morphs' position is at 1@1 in the form. This is due to the details of the fillig routines, at least one of which requires an extra 1-pixel margin around the outside. Computation of the filled form is done only on demand." | bb origin | closed ifFalse: [^ filledForm := nil]. filledForm ifNotNil: [^ filledForm]. filledForm := Form extent: bounds extent+2. "Draw the border..." bb := (BitBlt toForm: filledForm) sourceForm: nil; fillColor: Color black; combinationRule: Form over; width: 1; height: 1. origin := bounds topLeft asIntegerPoint-1. self lineSegmentsDo: [:p1 :p2 | bb drawFrom: p1 asIntegerPoint-origin to: p2 asIntegerPoint-origin]. "Fill it in..." filledForm convexShapeFill: Color black. + (self borderColor isColor and: [self borderColor isTranslucentColor]) ifTrue: - (borderColor isColor and: [borderColor isTranslucentColor]) ifTrue: ["If border is stored as a form, then erase any overlap now." filledForm copy: self borderForm boundingBox from: self borderForm to: 1@1 rule: Form erase]. ^ filledForm! Item was changed: ----- Method: PolygonMorph>>justDroppedInto:event: (in category 'dropping/grabbing') ----- justDroppedInto: newOwner event: evt | delta | (newOwner isKindOf: PasteUpMorph) ifTrue: ["Compensate for border width so that gridded drop is consistent with gridded drag of handles." + delta := self borderWidth+1//2. - delta := borderWidth+1//2. self position: (newOwner gridPoint: self position + delta) - delta]. ^ super justDroppedInto: newOwner event: evt! Item was changed: ----- Method: PolygonMorph>>vertices:color:borderWidth:borderColor: (in category 'initialization') ----- vertices: verts color: aColor borderWidth: borderWidthInteger borderColor: anotherColor super initialize. "" vertices := verts. color := aColor. + - borderWidth := borderWidthInteger. - borderColor := anotherColor. closed := vertices size > 2. arrows := #none. + + self borderStyle + color: anotherColor; + width: borderWidthInteger. + self computeBounds! Item was changed: ----- Method: RaisedBorder>>bottomRightColor (in category 'accessing') ----- bottomRightColor + ^ color mixed: 0.70 with: Color black! - ^width = 1 - ifTrue: [color twiceDarker] - ifFalse: [color darker]! Item was removed: - ----- Method: RaisedBorder>>colorsAtCorners (in category 'accessing') ----- - colorsAtCorners - | c c14 c23 | - c := self color. - c14 := c lighter. c23 := c darker. - ^Array with: c14 with: c23 with: c23 with: c14! Item was changed: ----- Method: RaisedBorder>>topLeftColor (in category 'accessing') ----- topLeftColor + ^ color mixed: 0.65 with: Color white! - ^width = 1 - ifTrue: [color twiceLighter] - ifFalse: [color lighter]! Item was changed: ----- Method: ScrollBar class>>arrowOfDirection:size:color: (in category 'images') ----- arrowOfDirection: aSymbol size: finalSizeInteger color: aColor "answer a form with an arrow based on the parameters" + ^ ArrowImagesCache at: {aSymbol. finalSizeInteger max: 1. aColor}! - ^ ArrowImagesCache at: {aSymbol. finalSizeInteger. aColor}! Item was changed: ----- Method: ScrollPane>>borderStyle: (in category 'accessing') ----- borderStyle: aBorderStyle super borderStyle: aBorderStyle. + scroller ifNotNil: [self setScrollDeltas].! - self setScrollDeltas! Item was changed: ----- Method: ScrollPane>>drawOverlayOn: (in category 'drawing') ----- drawOverlayOn: aCanvas "Draw my border OVER my submorphs because the scrollbars overlap." self wantsRoundedCorners + ifTrue: [aCanvas frameRoundRect: self bounds radius: self cornerRadius borderStyle: self borderStyle] + ifFalse: [aCanvas frameRectangle: self bounds borderStyle: self borderStyle]. - ifTrue: [aCanvas frameRoundRect: self bounds radius: self cornerRadius width: self borderStyle width color: self borderStyle color] - ifFalse: [aCanvas frameRectangle: self bounds width: self borderStyle width color: self borderStyle color]. super drawOverlayOn: aCanvas.! Item was changed: ----- Method: ScrollPane>>hResizeScrollBar (in category 'geometry') ----- hResizeScrollBar | topLeft h border offset | self hScrollBarPolicy == #never ifTrue: [^self]. + self bounds ifNil: [self fullBounds]. - bounds ifNil: [ self fullBounds ]. h := self scrollBarThickness. + border := self borderWidth. - border := borderWidth. offset := (scrollBarOnLeft and: [self vIsScrollbarShowing and: [retractableScrollBar not]]) ifTrue: [h] ifFalse: [0]. topLeft := retractableScrollBar ifTrue: [bounds bottomLeft + (offset @ border negated)] ifFalse: [bounds bottomLeft + (offset @ h negated)]. hScrollBar bounds: (topLeft extent: self hScrollBarWidth@ h)! Item was added: + ----- Method: ScrollPane>>insetColor (in category 'accessing') ----- + insetColor + + ^ self containingWindow + ifNil: [super insetColor] + ifNotNil: [:window | window colorForInsets]! Item was added: + ----- Method: ScrollPane>>raisedColor (in category 'accessing') ----- + raisedColor + + ^ self containingWindow + ifNil: [super raisedColor] + ifNotNil: [:window | window raisedColor]! Item was changed: ----- Method: ScrollPane>>setDefaultParameters (in category 'initialization') ----- setDefaultParameters "change the receiver's appareance parameters" self color: (self userInterfaceTheme color ifNil: [Color white]); + borderStyle: (self userInterfaceTheme borderStyle ifNil: [BorderStyle simple]) copy; - borderStyle: (self userInterfaceTheme borderStyle ifNil: [BorderStyle default]); borderColor: (self userInterfaceTheme borderColor ifNil: [Color gray: 0.6]); borderWidth: (self userInterfaceTheme borderWidth ifNil: [1]).! Item was changed: ----- Method: SimpleBorder>>baseColor: (in category 'accessing') ----- baseColor: aColor baseColor = aColor ifTrue:[^self]. + baseColor := aColor ifNil: [Color transparent]. + self color: baseColor "#color: will do #releaseCachedState"! - baseColor := aColor. - self color: aColor "#color: will do #releaseCachedState"! Item was changed: ----- Method: SimpleButtonMorph>>fitContents (in category 'accessing') ----- fitContents | aMorph aCenter | aCenter := self center. + self hasSubmorphs ifFalse: [^self]. + aMorph := self firstSubmorph. + self extent: aMorph extent + (self borderWidth + 6). - submorphs isEmpty ifTrue: [^self]. - aMorph := submorphs first. - self extent: aMorph extent + (borderWidth + 6). self center: aCenter. aMorph position: aCenter - (aMorph extent // 2)! Item was changed: ----- Method: SimpleButtonMorph>>label: (in category 'accessing') ----- 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: SimpleButtonMorph>>mouseUp: (in category 'event handling') ----- mouseUp: evt super mouseUp: evt. oldColor ifNotNil: ["if oldColor nil, it signals that mouse had not gone DOWN inside me, e.g. because of a cmd-drag; in this case we want to avoid triggering the action!!" self color: oldColor. oldColor := nil. (self containsPoint: evt cursorPoint) ifTrue: [ actWhen == #buttonUp ifTrue: [self doButtonAction] ] + ifFalse: [ self mouseLeave: evt "This is a balk. Note that we have left." ]]. + self borderStyle style = #inset ifTrue: [self borderRaised]. - ifFalse: [ self mouseLeave: evt "This is a balk. Note that we have left." ]] ! Item was changed: ----- Method: SimpleButtonMorph>>updateVisualState: (in category 'visual properties') ----- updateVisualState: evt + (self containsPoint: evt cursorPoint) + ifTrue: [ + oldColor ifNotNil: [self color: (oldColor mixed: 1/2 with: Color white)]. + self borderStyle style = #raised ifTrue: [self borderInset]] + ifFalse: [ + oldColor ifNotNil: [self color: oldColor]. + self borderStyle style = #inset ifTrue: [self borderRaised]]. - oldColor ifNotNil: [ - self color: - ((self containsPoint: evt cursorPoint) - ifTrue: [oldColor mixed: 1/2 with: Color white] - ifFalse: [oldColor])] ! Item was changed: ----- Method: Slider>>mouseDownInSlider: (in category 'other events') ----- mouseDownInSlider: event slider borderStyle style == #raised + ifTrue: [slider borderStyle: (BorderStyle inset width: slider borderWidth)]. - ifTrue: [slider borderColor: #inset]. self showSliderShadow.! Item was changed: ----- Method: Slider>>mouseUpInSlider: (in category 'other events') ----- mouseUpInSlider: event slider borderStyle style == #inset + ifTrue: [slider borderStyle: (BorderStyle raised width: slider borderWidth)]. - ifTrue: [slider borderColor: #raised]. self hideSliderShadow.! Item was changed: ----- Method: SystemProgressBarMorph>>setDefaultParameters (in category 'initialization') ----- setDefaultParameters "change the receiver's appareance parameters" self color: (self userInterfaceTheme color ifNil: [Color r: 0.977 g: 0.977 b: 0.977]); + borderStyle: (self userInterfaceTheme borderStyle ifNil: [BorderStyle simple]) copy; - borderStyle: (self userInterfaceTheme borderStyle ifNil: [BorderStyle default]); borderColor: (self userInterfaceTheme borderColor ifNil: [Color transparent]); borderWidth: (self userInterfaceTheme borderWidth ifNil: [0]); barColor: (self userInterfaceTheme barColor ifNil: [Color r: 0.72 g: 0.72 b: 0.9]).! Item was changed: ----- Method: SystemProgressMorph>>setDefaultParameters (in category 'initialization') ----- setDefaultParameters "change the receiver's appareance parameters" self color: (self userInterfaceTheme color ifNil: [Color r: 0.9 g: 0.9 b: 0.9]); + borderStyle: (self userInterfaceTheme borderStyle ifNil: [BorderStyle simple]) copy; - borderStyle: (self userInterfaceTheme borderStyle ifNil: [BorderStyle default]); borderColor: (self userInterfaceTheme borderColor ifNil: [Color gray]); borderWidth: (self userInterfaceTheme borderWidth ifNil: [1]). Preferences menuAppearance3d ifTrue: [self addDropShadow]. self font: (self userInterfaceTheme font ifNil: [TextStyle defaultFont]); textColor: (self userInterfaceTheme textColor ifNil: [Color black]). self updateColor: self color: self color intensity: 1.! Item was changed: ----- Method: SystemWindow>>setLabel: (in category 'label') ----- setLabel: aString | frame | labelString := aString. label ifNil: [^ self]. label contents: (aString ifNil: ['']). self labelWidgetAllowance. "Sets it if not already" self isCollapsed ifTrue: [self extent: (label width + labelWidgetAllowance) @ (self labelHeight + 2)] + ifFalse: [label fitContents; setWidth: (label width min: self width - labelWidgetAllowance). + label align: label bounds topCenter with: self topCenter + (0@self borderWidth). - ifFalse: [label fitContents; setWidth: (label width min: bounds width - labelWidgetAllowance). - label align: label bounds topCenter with: bounds topCenter + (0@borderWidth). collapsedFrame ifNotNil: [collapsedFrame := collapsedFrame withWidth: label width + labelWidgetAllowance]]. frame := LayoutFrame new. frame leftFraction: 0.5; topFraction: 0.5; leftOffset: label width negated // 2; topOffset: label height negated // 2. label layoutFrame: frame. ! Item was removed: - ----- Method: TTSampleFontMorph>>doesBevels (in category 'accessing') ----- - doesBevels - ^false! Item was changed: ----- Method: TTSampleFontMorph>>drawOn: (in category 'drawing') ----- drawOn: aCanvas | origin extent offset | (font isNil) + ifTrue:[^aCanvas frameRectangle: self bounds color: Color black]. - ifTrue:[^aCanvas frameRectangle: bounds color: Color black]. origin := self position asIntegerPoint. extent := self extent asIntegerPoint. 0 to: 16 do:[:i| offset := (extent x * i // 16) @ (extent y * i // 16). aCanvas line: origin x @ (origin y + offset y) to: (origin x + extent x) @ (origin y + offset y) + width: self borderWidth color: self borderColor. - width: borderWidth color: borderColor. aCanvas line: (origin x + offset x) @ origin y to: (origin x + offset x) @ (origin y + extent y) + width: self borderWidth color: self borderColor. - width: borderWidth color: borderColor. ]. aCanvas asBalloonCanvas preserveStateDuring:[:balloonCanvas| balloonCanvas transformBy: self transform. balloonCanvas aaLevel: self smoothing. self drawCharactersOn: balloonCanvas. ].! Item was changed: ----- Method: TTSampleStringMorph>>computeTransform (in category 'private') ----- computeTransform | cy | cy := bounds origin y + bounds corner y * 0.5. transform := MatrixTransform2x3 + transformFromLocal: (ttBounds insetBy: self borderWidth negated) - transformFromLocal: (ttBounds insetBy: borderWidth negated) toGlobal: bounds. transform := transform composedWithGlobal:(MatrixTransform2x3 withOffset: 0 @ cy negated). transform := transform composedWithGlobal:(MatrixTransform2x3 withScale: 1.0 @ -1.0). transform := transform composedWithGlobal:(MatrixTransform2x3 withOffset: 0 @ cy). ^transform! Item was changed: ----- Method: TTSampleStringMorph>>drawOn: (in category 'drawing') ----- drawOn: aCanvas | xStart | (font isNil or:[string isNil or:[string isEmpty]]) + ifTrue:[^aCanvas frameRectangle: self bounds color: Color black]. - ifTrue:[^aCanvas frameRectangle: bounds color: Color black]. xStart := 0. aCanvas asBalloonCanvas preserveStateDuring:[:balloonCanvas| balloonCanvas transformBy: self transform. balloonCanvas aaLevel: self smoothing. string do:[:char| | glyph | glyph := font at: char. balloonCanvas preserveStateDuring:[:subCanvas| subCanvas transformBy: (MatrixTransform2x3 withOffset: xStart@0). subCanvas drawGeneralBezierShape: glyph contours + color: self color + borderWidth: self borderWidth + borderColor: self borderColor]. - color: color - borderWidth: borderWidth - borderColor: borderColor]. xStart := xStart + glyph advanceWidth. ]. ].! Item was changed: ----- Method: TTSampleStringMorph>>initializeString (in category 'initialize') ----- initializeString | xStart char glyph | (font isNil or: [string isNil]) ifTrue: [^ self]. xStart := 0. ttBounds := 0@0 corner: 0@0. 1 to: string size do: [:i | char := string at: i. glyph := font at: char. ttBounds := ttBounds quickMerge: (glyph bounds translateBy: xStart@0). xStart := xStart + glyph advanceWidth. ]. self extent: ttBounds extent // 40. + self borderWidth: ttBounds height // 40! - borderWidth := ttBounds height // 40! Item was changed: ----- Method: TextMorph>>areasRemainingToFill: (in category 'drawing') ----- areasRemainingToFill: aRectangle "Overridden from BorderedMorph to test backgroundColor instead of (text) color." (self backgroundColor isNil or: [self backgroundColor asColor isTranslucent]) ifTrue: [^ Array with: aRectangle]. self wantsRoundedCorners + ifTrue: [(self borderWidth > 0 and: [self borderColor isColor and: [self borderColor isTranslucent]]) - ifTrue: [(borderWidth > 0 and: [borderColor isColor and: [borderColor isTranslucent]]) ifTrue: [^ aRectangle areasOutside: (self innerBounds intersect: self boundsWithinCorners)] ifFalse: [^ aRectangle areasOutside: self boundsWithinCorners]] + ifFalse: [(self borderWidth > 0 and: [self borderColor isColor and: [self borderColor isTranslucent]]) - ifFalse: [(borderWidth > 0 and: [borderColor isColor and: [borderColor isTranslucent]]) ifTrue: [^ aRectangle areasOutside: self innerBounds] ifFalse: [^ aRectangle areasOutside: self bounds]]! Item was changed: ----- Method: TextMorph>>convertToCurrentVersion:refStream: (in category 'objects from disk') ----- convertToCurrentVersion: varDict refStream: smartRefStrm + self borderWidth ifNil: [ + self borderWidth: 0. - borderWidth ifNil: - [borderWidth := 0. self removeProperty: #fillStyle]. ^ super convertToCurrentVersion: varDict refStream: smartRefStrm. ! Item was added: + ----- Method: TextMorph>>defaultBorderWidth (in category 'initialization') ----- + defaultBorderWidth + ^ 0! Item was changed: ----- Method: TextMorph>>fit (in category 'private') ----- fit "Adjust my bounds to fit the text. Should be a no-op if autoFit is not specified. Required after the text changes, or if wrapFlag is true and the user attempts to change the extent." | newExtent para cBounds lastOfLines heightOfLast wid | self isAutoFit ifTrue: [wid := (text notNil and: [text size > 2]) ifTrue: [5] ifFalse: [40]. newExtent := (self paragraph extent max: wid @ ( self defaultLineHeight)) + (0 @ 2). + newExtent := newExtent + (2 * self borderWidth). - newExtent := newExtent + (2 * borderWidth). margins ifNotNil: [newExtent := ((0 @ 0 extent: newExtent) expandBy: margins) extent]. newExtent ~= bounds extent ifTrue: [(container isNil and: [successor isNil]) ifTrue: [para := paragraph. "Save para (layoutChanged smashes it)" super extent: newExtent. paragraph := para]]. container notNil & successor isNil ifTrue: [cBounds := container bounds truncated. "23 sept 2000 - try to allow vertical growth" lastOfLines := self paragraph lines last. heightOfLast := lastOfLines bottom - lastOfLines top. (lastOfLines last < text size and: [lastOfLines bottom + heightOfLast >= self bottom]) ifTrue: [container releaseCachedState. cBounds := cBounds origin corner: cBounds corner + (0 @ heightOfLast)]. self privateBounds: cBounds]]. "These statements should be pushed back into senders" self paragraph positionWhenComposed: self position. successor ifNotNil: [successor predecessorChanged]. self changed "Too conservative: only paragraph composition should cause invalidation."! Item was changed: ----- Method: TextMorph>>hasTranslucentColor (in category 'accessing') ----- hasTranslucentColor "Overridden from BorderedMorph to test backgroundColor instead of (text) color." + ^ self backgroundColor isNil + or: [self backgroundColor isColor and: [self backgroundColor isTranslucentColor]] + or: [self borderColor isColor and: [self borderColor isTranslucentColor]]! - ^ backgroundColor isNil - or: [backgroundColor isColor and: [backgroundColor isTranslucentColor]] - or: [borderColor isColor and: [borderColor isTranslucentColor]]! Item was changed: ----- Method: TextMorph>>initialize (in category 'initialization') ----- initialize + super initialize. + - borderWidth := 0. textStyle := TextStyle default copy. wrapFlag := true. ! Item was changed: ----- Method: TextMorph>>minHeight (in category 'layout') ----- minHeight | result | textStyle ifNil: [^ 16]. - borderWidth ifNil: [^ 16]. + result := (textStyle lineGrid + 2) + (self borderWidth*2). - result := (textStyle lineGrid + 2) + (borderWidth*2). margins ifNil: [^ result]. ^ margins isRectangle ifTrue: [result + margins top + margins bottom] ifFalse: [margins isPoint ifTrue: [result + margins y + margins y] ifFalse: [result + (2*margins)]]! Item was changed: ----- Method: TextMorph>>minWidth (in category 'layout') ----- minWidth | result | textStyle ifNil: [^ 9]. - borderWidth ifNil: [^ 9]. + result := 9 + (self borderWidth*2). - result := 9 + (borderWidth*2). margins ifNil: [^ result]. ^ margins isRectangle ifTrue: [result + margins left + margins right] ifFalse: [margins isPoint ifTrue: [result + margins x + margins x] ifFalse: [result + (2*margins)]]! Item was changed: + (PackageInfo named: 'Morphic') postscript: 'Project allMorphicProjects do: [:p | + p world allMorphsDo: [:m | + (m isKindOf: BorderedMorph) ifTrue: [ + m borderColor: (m instVarNamed: #borderColor). + m borderWidth: (m instVarNamed: #borderWidth)]]].'! - (PackageInfo named: 'Morphic') postscript: 'MenuIcons classPool at: #Icons put: ((MenuIcons classPool at: #Icons) as: Dictionary)'!

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Packages May 2018