Packages January 2023

packages@lists.squeakfoundation.org

1 participants
145 discussions

The Trunk: ToolBuilder-Morphic-mt.327.mcz
by commits＠source.squeak.org 26 Jan '23

26 Jan '23

Marcel Taeumel uploaded a new version of ToolBuilder-Morphic to project The Trunk: http://source.squeak.org/trunk/ToolBuilder-Morphic-mt.327.mcz ==================== Summary ==================== Name: ToolBuilder-Morphic-mt.327 Author: mt Time: 26 January 2023, 11:21:23.178998 am UUID: 33c4ffbc-3887-a84e-a903-f262c9010ffd Ancestors: ToolBuilder-Morphic-mt.326 In tree widgets, avoid filter change for arrow keys. =============== Diff against ToolBuilder-Morphic-mt.326 =============== Item was changed: ----- Method: PluggableTreeMorph>>basicKeyPressed: (in category 'event handling') ----- basicKeyPressed: aChar + aChar asciiValue >= 32 ifFalse: [^ false]. self updateLastKeystrokes: aChar. model okToChange ifFalse: [^ false]. PluggableListMorph filterableLists ifTrue: [self triggerFilterTree] ifFalse: [self selectNextMorphByFilter]. ^ true!

1 0

The Trunk: Morphic-mt.2077.mcz
by commits＠source.squeak.org 26 Jan '23

26 Jan '23

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.2077.mcz ==================== Summary ==================== Name: Morphic-mt.2077 Author: mt Time: 26 January 2023, 11:17:15.858707 am UUID: 17adbf1c-192f-9647-9e7c-912e0df5ef19 Ancestors: Morphic-mt.2076 Tree navigation: - [arrow-left] now jumps to parent if not expanded, collapse otherwise - [SHIFT]+[arrow-up/down] now jumps between siblings only =============== Diff against Morphic-mt.2076 =============== Item was added: + ----- Method: IndentingListItemMorph>>previousSibling (in category 'accessing') ----- + previousSibling + + container ifNil: [^ self]. + (container parentMorphOf: self) + ifNil: [^ nil] + ifNotNil: [:pm | + | currentChild | + currentChild := pm firstChild. + [currentChild isNil or: [currentChild nextSibling == self]] + whileFalse: [currentChild := currentChild nextSibling]. + ^ currentChild].! Item was added: + ----- Method: IndentingListItemMorph>>previousVisibleSibling (in category 'accessing') ----- + previousVisibleSibling + + ^ self previousSibling ifNotNil: [:c | + c visible ifTrue: [c] ifFalse: [c previousVisibleSibling]]! Item was changed: ----- Method: SimpleHierarchicalListMorph>>arrowKey: (in category 'keyboard navigation') ----- arrowKey: asciiValue "Handle a keyboard navigation character. Answer true if handled, false if not." | keyEvent max oldSelection nextSelection howManyItemsShowing keyHandled | keyHandled := false. keyEvent := asciiValue. max := self maximumSelection. nextSelection := oldSelection := self getSelectionIndex. keyEvent = 31 ifTrue:["down" + self currentEvent shiftPressed ifTrue: [ + self selectedMorph nextVisibleSibling + ifNil: [^ false] + ifNotNil: [:m | self setSelectedMorph: m. ^ true]]. keyHandled := true. nextSelection :=oldSelection + 1. nextSelection > max ifTrue: [nextSelection := (self class wrappedNavigation ifTrue: [1] ifFalse: [max])]]. keyEvent = 30 ifTrue:["up" + self currentEvent shiftPressed ifTrue: [ + self selectedMorph previousVisibleSibling + ifNil: [^ false] + ifNotNil: [:m | self setSelectedMorph: m. ^ true]]. keyHandled := true. nextSelection := oldSelection - 1. nextSelection < 1 ifTrue: [nextSelection := self class wrappedNavigation ifTrue: [max] ifFalse: [1]]]. keyEvent = 1 ifTrue: ["home" keyHandled := true. nextSelection := 1]. keyEvent = 4 ifTrue: ["end" keyHandled := true. nextSelection := max]. howManyItemsShowing := self numSelectionsInView. keyEvent = 11 ifTrue: ["page up" keyHandled := true. nextSelection := 1 max: oldSelection - howManyItemsShowing]. keyEvent = 12 ifTrue: ["page down" keyHandled := true. nextSelection := oldSelection + howManyItemsShowing min: max]. (nextSelection ~= oldSelection or: [ keyHandled and: [ self class wrappedNavigation not ]]) ifTrue: [ self setSelectionIndex: nextSelection. ^ true]. keyEvent = 29 ifTrue:["right" selectedMorph ifNotNil:[ (selectedMorph canExpand and:[selectedMorph isExpanded not]) ifTrue:[self toggleExpandedState: selectedMorph] ifFalse:[self setSelectionIndex: self getSelectionIndex+1]. ]. ^true]. keyEvent = 28 ifTrue:["left" selectedMorph ifNotNil:[ (selectedMorph isExpanded) ifTrue:[self toggleExpandedState: selectedMorph] + ifFalse:[ + self selectedParentMorph + ifNil: [self setSelectionIndex: (self getSelectionIndex-1 max: 1)] + ifNotNil: [:pm | self setSelectedMorph: pm]] - ifFalse:[self setSelectionIndex: (self getSelectionIndex-1 max: 1)]. ]. ^true]. ^false! Item was added: + ----- Method: SimpleHierarchicalListMorph>>parentMorphOf: (in category 'selection') ----- + parentMorphOf: itemMorph + "Answers the parent morph for itemMorph or nil if there is none." + + | wrapper | + wrapper := itemMorph complexContents. + ^ (wrapper respondsTo: #parent) + ifFalse: [ | parentItemMorph | + parentItemMorph := itemMorph. + [parentItemMorph isNil + or: [parentItemMorph indentLevel = (itemMorph indentLevel -1)]] + whileFalse: [parentItemMorph := parentItemMorph submorphBefore]] + ifTrue: [ + wrapper := wrapper parent. + scroller submorphs + detect: [:each | each complexContents == wrapper] + ifNone: [nil]]! Item was added: + ----- Method: SimpleHierarchicalListMorph>>selectedParentMorph (in category 'selection') ----- + selectedParentMorph + + ^ self selectedMorph ifNotNil: [:itemMorph | + self parentMorphOf: itemMorph]!

1 0

The Trunk: 61Deprecated-mt.5.mcz
by commits＠source.squeak.org 26 Jan '23

26 Jan '23

Marcel Taeumel uploaded a new version of 61Deprecated to project The Trunk: http://source.squeak.org/trunk/61Deprecated-mt.5.mcz ==================== Summary ==================== Name: 61Deprecated-mt.5 Author: mt Time: 26 January 2023, 10:45:43.168707 am UUID: ac04ea2b-ad36-7049-8439-b24ef8901d3c Ancestors: 61Deprecated-mt.4 Complement Morphic-mt.2076 =============== Diff against 61Deprecated-mt.4 =============== Item was added: + ----- Method: Morph>>highlightForMouseDown (in category '*61Deprecated-drawing') ----- + highlightForMouseDown + + self deprecated: 'Use #highlightedForMouseDown: true'. + self highlightedForMouseDown: true.! Item was added: + ----- Method: Morph>>highlightForMouseDown: (in category '*61Deprecated-drawing') ----- + highlightForMouseDown: aBoolean + + self deprecated: 'Use #highlightedForMouseDown:'. + self highlightedForMouseDown: aBoolean.!

1 0

The Trunk: Morphic-mt.2076.mcz
by commits＠source.squeak.org 26 Jan '23

26 Jan '23

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.2076.mcz ==================== Summary ==================== Name: Morphic-mt.2076 Author: mt Time: 26 January 2023, 10:45:16.970707 am UUID: cc104798-6dc6-2a4d-9db9-c459cb739680 Ancestors: Morphic-mt.2075 Some code clean-up around a morph#s "highlight-for-mouse-down" feature. =============== Diff against Morphic-mt.2075 =============== Item was changed: ----- Method: LazyListMorph>>highlightPotentialDropRow:on: (in category 'drawing') ----- highlightPotentialDropRow: row on: aCanvas | drawBounds | drawBounds := self drawBoundsForRow: row. drawBounds := drawBounds intersect: self bounds. + aCanvas frameRectangle: drawBounds width: 1 px color: self selectionColor asColor! - aCanvas frameRectangle: drawBounds color: self selectionColor asColor! Item was changed: ----- Method: Morph>>drawMouseDownHighlightOn: (in category 'drawing') ----- drawMouseDownHighlightOn: aCanvas self highlightedForMouseDown ifTrue: [ self wantsRoundedCorners + ifTrue: [aCanvas frameRoundRect: self fullBounds radius: self cornerRadius width: 1 px color: self color darker darker] + ifFalse: [aCanvas frameRectangle: self fullBounds width: 1 px color: self color darker darker]].! - ifTrue: [aCanvas frameRoundRect: self fullBounds radius: self cornerRadius width: 1 color: self color darker darker] - ifFalse: [aCanvas frameRectangle: self fullBounds color: self color darker darker]].! Item was removed: - ----- Method: Morph>>highlightForMouseDown (in category 'drawing') ----- - highlightForMouseDown - self highlightForMouseDown: true! Item was removed: - ----- Method: Morph>>highlightForMouseDown: (in category 'drawing') ----- - highlightForMouseDown: aBoolean - aBoolean - ifTrue:[self setProperty: #highlightedForMouseDown toValue: aBoolean] - ifFalse:[self removeProperty: #highlightedForMouseDown. self resetExtension]. - self changed! Item was changed: ----- Method: Morph>>highlightedForMouseDown (in category 'drawing') ----- highlightedForMouseDown + + extension ifNil: [^ false]. + ^ (self valueOfProperty: #highlightedForMouseDown) == true! - ^(self valueOfProperty: #highlightedForMouseDown) == true! Item was added: + ----- Method: Morph>>highlightedForMouseDown: (in category 'drawing') ----- + highlightedForMouseDown: aBoolean + + (extension isNil and: [aBoolean not]) ifTrue: [^ self]. + self highlightedForMouseDown == aBoolean ifTrue: [^ self]. + aBoolean + ifFalse: [self removeProperty: #highlightedForMouseDown] + ifTrue: [self setProperty: #highlightedForMouseDown toValue: aBoolean]. + self changed.! Item was changed: ----- Method: SimpleHierarchicalListMorph>>mouseDown: (in category 'event handling') ----- mouseDown: evt | aMorph selectors | aMorph := self itemFromPoint: evt position. evt yellowButtonPressed "First check for option (menu) click" ifTrue: [ (PluggableListMorph menuRequestUpdatesSelection and: [model okToChange]) ifTrue: [ aMorph == selectedMorph ifFalse: [self setSelectedMorph: aMorph]]. ^ self yellowButtonActivity: evt shiftPressed]. (aMorph notNil and:[aMorph inToggleArea: (aMorph point: evt position from: self)]) ifTrue:[^self toggleExpandedState: aMorph event: evt]. aMorph ifNil:[^super mouseDown: evt]. + PluggableListMorph highlightPreSelection ifTrue: [ + aMorph highlightedForMouseDown: true. + self setProperty: #highlightedMorph toValue: aMorph]. - aMorph highlightForMouseDown. - self setProperty: #highlightedMorph toValue: aMorph. selectors := Array with: #click: with: (self doubleClickEnabled ifTrue: [#doubleClick:] ifFalse: [nil]) with: nil with: (self dragEnabled ifTrue:[#startDrag:] ifFalse:[nil]). evt hand waitForClicksOrDrag: self event: evt selectors: selectors threshold: HandMorph dragThreshold "pixels".! Item was changed: ----- Method: SimpleHierarchicalListMorph>>mouseUp: (in category 'event handling') ----- mouseUp: event + | clickedMorph | + model okToChange ifFalse: [^ self]. + (clickedMorph := self itemFromPoint: event position) ifNil: [^ self]. - | clickedMorph highlightedMorph | - clickedMorph := self itemFromPoint: event position. - highlightedMorph := self valueOfProperty: #highlightedMorph ifAbsent: []. - self removeProperty: #highlightedMorph. - - ((model okToChange not - or: [clickedMorph isNil]) - or: [clickedMorph ~~ highlightedMorph]) ifTrue: [ - highlightedMorph ifNotNil: [:m | m highlightForMouseDown: false]. - ^ self]. + (self valueOfProperty: #highlightedMorph ifAbsent: []) + ifNotNil: [:m | + m highlightedForMouseDown: false. + self removeProperty: #highlightedMorph]. + ((autoDeselect isNil or: [autoDeselect]) and: [clickedMorph == selectedMorph]) ifTrue: [self setSelectedMorph: nil] ifFalse: [self setSelectedMorph: clickedMorph]. - highlightedMorph highlightForMouseDown: false. event hand newKeyboardFocus: self. Cursor normal show.! Item was changed: ----- Method: SimpleHierarchicalListMorph>>removeObsoleteEventHandlers (in category 'obsolete') ----- removeObsoleteEventHandlers scroller submorphs do:[:m| + m eventHandler: nil; highlightedForMouseDown: false; resetExtension].! - m eventHandler: nil; highlightForMouseDown: false; resetExtension].! Item was changed: ----- Method: SimpleHierarchicalListMorph>>startDrag: (in category 'drag and drop') ----- startDrag: evt | itemMorph | evt hand hasSubmorphs ifTrue: [^ self]. self model okToChange ifFalse: [^ self]. itemMorph := scroller submorphs detect: [:any | any highlightedForMouseDown] ifNone: [^ self]. "Prepare visuals." + itemMorph highlightedForMouseDown: false. - itemMorph highlightForMouseDown: false. self setSelectedMorph: itemMorph. [ "Initiate drag." (self model dragPassengerFor: itemMorph inMorph: self) ifNotNil: [:passenger | | ddm | ddm := (self valueOfProperty: #dragTransferClass ifAbsent: [TransferMorph]) withPassenger: passenger from: self. ddm dragTransferType: (self model dragTransferTypeForMorph: self). ddm updateFromUserInputEvent: evt. self model dragStartedFor: itemMorph transferMorph: ddm. evt hand grabMorph: ddm]. ] ensure: [ Cursor normal show. evt hand releaseMouseFocus: self].!

1 0

The Trunk: Morphic-mt.2075.mcz
by commits＠source.squeak.org 26 Jan '23

26 Jan '23

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.2075.mcz ==================== Summary ==================== Name: Morphic-mt.2075 Author: mt Time: 26 January 2023, 10:20:57.216707 am UUID: 6f66e69c-5e99-1d4b-abdf-1d4235feae4a Ancestors: Morphic-mt.2074 Performance slightly improved for larger tree widgets. =============== Diff against Morphic-mt.2074 =============== Item was changed: ----- Method: IndentingListItemMorph>>backgroundColor: (in category 'accessing') ----- backgroundColor: aColor + + backgroundColor = aColor ifTrue: [^ self]. backgroundColor := aColor. self changed.! Item was changed: ----- Method: IndentingListItemMorph>>fitContents (in category 'layout') ----- fitContents + self extent: container preferredSubmorphWidth @ self fontToUse lineGridForMorphs.! - super fitContents. - self width: container preferredSubmorphWidth.! Item was changed: ----- Method: IndentingListItemMorph>>initWithColor:andFont: (in category 'initialization') ----- initWithColor: aColor andFont: aFont "Configure the receiver with aColor and aFont as prescribed by the owning tree morph. Ignore a property if overridden from text label. See #initializeFromText:. That is, a tree morph prescribes a certain appearance for all its items, which it will constantly create and destroy as users collapse and expand items in the tree. During construction of each item, any text label will be set *before* calling this method. So we can check #hasColorFromText and other flags that will help us decide whether to keep a property or not." (self hasProperty: #hasColorFromText) ifFalse: [self color: aColor]. (self hasProperty: #hasEmphasisFromText) ifTrue: [ (self hasProperty: #hasFontFromText) ifFalse: [self font: aFont "Keeps emphasis from text."]] ifFalse: [ (self hasProperty: #hasFontFromText) ifTrue: [self emphasis: aFont emphasis "Keeps font from text."] + ifFalse: [self setFont: aFont emphasis: nil]] - ifFalse: [self font: aFont emphasis: aFont emphasis]] ! Item was changed: ----- Method: IndentingListItemMorph>>initWithContents:prior:forList:indentLevel: (in category 'initialization') ----- initWithContents: anObject prior: priorMorph forList: hostList indentLevel: newLevel container := hostList. complexContents := anObject. anObject addDependent: self. self initWithContents: self getLabel font: Preferences standardListFont emphasis: nil. indentLevel := 0. isExpanded := false. nextSibling := firstChild := nil. priorMorph ifNotNil: [ priorMorph nextSibling: self. ]. indentLevel := newLevel. + icon := self getIcon ifNotNil: [:form | form scaleIconToDisplay].! - icon := self getIcon ifNotNil: [:form | form scaleIconToDisplay]. - self extent: self minWidth @ self minHeight! Item was changed: ----- Method: SimpleHierarchicalListMorph>>adjustSubmorphPositions (in category 'private') ----- adjustSubmorphPositions | p | p := 0@0. scroller submorphsDo: [ :each | | h | each visible ifTrue: [ h := each height. each privateBounds: (p extent: self preferredSubmorphWidth@h). p := p + (0@h) ]]. + scroller layoutChanged. self clearColumnsCache; changed; layoutChanged; setScrollDeltas. ! Item was changed: ----- Method: StringMorph>>emphasis (in category 'accessing') ----- emphasis "self assert: emphasis = self font emphasis" + ^ emphasis ifNil: [emphasis := font emphasis]! - ^ emphasis! Item was changed: ----- Method: StringMorph>>font:emphasis: (in category 'accessing - convenience') ----- font: aFontOrNil emphasis: emphasisCodeOrNil "For convenience only. Try to use #font: and #emphasis: instead. Changes font and/or emphasis. If both are given, the font's current emphasis will be discarded. If only the emphasis is given, the system's default font will be used. If only the font is given, the font's emphasis will be cached so that future calls to #font: will keep the emphasis." self assert: aFontOrNil notNil | emphasisCodeOrNil notNil description: 'Either font or emphasis must be non-nil.'. self + setFont: ((aFontOrNil isNil or: [emphasisCodeOrNil isNil] or: [aFontOrNil emphasis = emphasisCodeOrNil]) - setFont: ((aFontOrNil isNil or: [aFontOrNil emphasis = emphasisCodeOrNil] or: [emphasisCodeOrNil isNil]) ifTrue: [aFontOrNil] ifFalse: [aFontOrNil emphasized: emphasisCodeOrNil]) + emphasis: emphasisCodeOrNil. - emphasis: (emphasisCodeOrNil ifNil: [aFontOrNil emphasis]). "self assert: self font emphasis = self emphasis. --- mt: Does not always work because of how StrikeFont treats emphasis 0 in #emphasized:."!

1 0

The Trunk: ToolBuilder-Morphic-mt.326.mcz
by commits＠source.squeak.org 26 Jan '23

26 Jan '23

Marcel Taeumel uploaded a new version of ToolBuilder-Morphic to project The Trunk: http://source.squeak.org/trunk/ToolBuilder-Morphic-mt.326.mcz ==================== Summary ==================== Name: ToolBuilder-Morphic-mt.326 Author: mt Time: 26 January 2023, 10:19:17.584707 am UUID: 1e892378-a503-ca42-9cb1-df68649c5f06 Ancestors: ToolBuilder-Morphic-mt.325 Performance slightly improved for larger tree widgets. =============== Diff against ToolBuilder-Morphic-mt.325 =============== Item was added: + ----- Method: PluggableTreeMorph>>hUnadjustedScrollRange (in category 'scrolling') ----- + hUnadjustedScrollRange + "Optimized for performance. Assume horizontal scrollbar hidden." + + ^ self preferredSubmorphWidth!

1 0

The Trunk: Morphic-mt.2074.mcz
by commits＠source.squeak.org 26 Jan '23

26 Jan '23

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.2074.mcz ==================== Summary ==================== Name: Morphic-mt.2074 Author: mt Time: 26 January 2023, 10:17:17.173707 am UUID: 86716017-7fb9-0a4f-8636-4cad85f37d89 Ancestors: Morphic-mt.2073 Complement ToolBuilder-Morphic-mt.325 =============== Diff against Morphic-mt.2073 =============== Item was added: + ----- Method: SimpleHierarchicalListMorph>>doubleClickEnabled (in category 'accessing') ----- + doubleClickEnabled + + ^ false! Item was changed: ----- Method: SimpleHierarchicalListMorph>>mouseDown: (in category 'event handling') ----- mouseDown: evt | aMorph selectors | + aMorph := self itemFromPoint: evt position. evt yellowButtonPressed "First check for option (menu) click" ifTrue: [ (PluggableListMorph menuRequestUpdatesSelection and: [model okToChange]) ifTrue: [ aMorph == selectedMorph ifFalse: [self setSelectedMorph: aMorph]]. ^ self yellowButtonActivity: evt shiftPressed]. (aMorph notNil and:[aMorph inToggleArea: (aMorph point: evt position from: self)]) ifTrue:[^self toggleExpandedState: aMorph event: evt]. aMorph ifNil:[^super mouseDown: evt]. aMorph highlightForMouseDown. self setProperty: #highlightedMorph toValue: aMorph. selectors := Array with: #click: + with: (self doubleClickEnabled ifTrue: [#doubleClick:] ifFalse: [nil]) with: nil - with: nil with: (self dragEnabled ifTrue:[#startDrag:] ifFalse:[nil]). evt hand waitForClicksOrDrag: self event: evt selectors: selectors threshold: HandMorph dragThreshold "pixels".!

1 0

The Trunk: ToolBuilder-Morphic-mt.325.mcz
by commits＠source.squeak.org 26 Jan '23

26 Jan '23

Marcel Taeumel uploaded a new version of ToolBuilder-Morphic to project The Trunk: http://source.squeak.org/trunk/ToolBuilder-Morphic-mt.325.mcz ==================== Summary ==================== Name: ToolBuilder-Morphic-mt.325 Author: mt Time: 26 January 2023, 10:16:05.732707 am UUID: 5a111852-b783-a84a-a916-baffdb42a7b3 Ancestors: ToolBuilder-Morphic-mt.324 Remove some code duplication in SimpleHierarchicalListMorph and PluggableTreeMorph. =============== Diff against ToolBuilder-Morphic-mt.324 =============== Item was removed: - ----- Method: PluggableTreeMorph>>mouseDown: (in category 'event handling') ----- - mouseDown: evt - | aMorph selectors | - - aMorph := self itemFromPoint: evt position. - evt yellowButtonPressed "First check for option (menu) click" - ifTrue: [ - (PluggableListMorph menuRequestUpdatesSelection and: [model okToChange]) ifTrue: [ - aMorph == selectedMorph - ifFalse: [self setSelectedMorph: aMorph]]. - ^ self yellowButtonActivity: evt shiftPressed]. - (aMorph notNil and:[aMorph inToggleArea: (aMorph point: evt position from: self)]) - ifTrue:[^self toggleExpandedState: aMorph event: evt]. - aMorph ifNil:[^super mouseDown: evt]. - - aMorph highlightForMouseDown. - self setProperty: #highlightedMorph toValue: aMorph. - - selectors := Array - with: #click: - with: (self doubleClickEnabled ifTrue: [#doubleClick:] ifFalse: [nil]) - with: nil - with: (self dragEnabled ifTrue:[#startDrag:] ifFalse:[nil]). - evt hand waitForClicksOrDrag: self event: evt selectors: selectors threshold: HandMorph dragThreshold "pixels".!

1 0

The Trunk: Morphic-mt.2073.mcz
by commits＠source.squeak.org 24 Jan '23

24 Jan '23

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.2073.mcz ==================== Summary ==================== Name: Morphic-mt.2073 Author: mt Time: 24 January 2023, 12:12:52.41521 pm UUID: 92a7b762-9375-1043-9963-0c362137ce72 Ancestors: Morphic-mt.2072 Minor refactoring of label drawing in tree widgets. Also fixes that "trailing TAB" issue where label content got cut off. =============== Diff against Morphic-mt.2072 =============== Item was added: + ----- Method: IndentingListItemMorph>>drawLabelInColumnsOn:in: (in category 'drawing') ----- + drawLabelInColumnsOn: aCanvas in: drawBounds + "Draw the receiver appearing in multiple columns. Use TAB character to move between columns." + + | columnScanner columnLeft columnRect columnData | + self assert: [container columns size > 1]. + columnScanner := ReadStream on: contents asString. + container columns withIndexDo: [ :widthSpec :column | + | columnWidth | + "Compute first/next column offset." + column = 1 + ifTrue: [columnLeft := drawBounds left] + ifFalse: [columnLeft := columnRect right + 5 px]. + "Draw icon." + column = self class iconColumnIndex ifTrue: [ + icon ifNotNil: [ + aCanvas + translucentImage: icon + at: columnLeft @ (self top + (self height - icon height // 2)). + columnLeft := columnLeft + icon width + 2]]. + "Compute drawing bounds for label portion." + columnWidth := self widthOfColumn: column. + column = 1 ifTrue: [ "Reduce width by indentation present in first column only" + columnWidth := columnWidth - (drawBounds left - self left) + self hMargin]. + columnRect := columnLeft @ drawBounds top extent: columnWidth @ drawBounds height. + columnData := columnScanner upTo: Character tab. + "Draw label portion." + columnData ifNotEmpty: [ + aCanvas drawString: columnData in: columnRect font: self fontToUse color: self colorToUse] ]. + + "Handle trailing TAB issue in string representation." + columnScanner upToEnd ifNotEmpty: [:rest | + columnRect := columnLeft + (self fontToUse widthOfString: columnData) @ drawBounds top extent: columnRect extent. + aCanvas drawString: String tab, rest in: columnRect font: self fontToUse color: self colorToUse].! Item was added: + ----- Method: IndentingListItemMorph>>drawLabelOn:in: (in category 'drawing') ----- + drawLabelOn: aCanvas in: drawBounds + + | labelBounds | + icon + ifNil: [labelBounds := drawBounds] + ifNotNil: [ + aCanvas + translucentImage: icon + at: drawBounds left @ (self top + (self height - icon height // 2)). + labelBounds := drawBounds left: drawBounds left + icon width + 2]. + + aCanvas + drawString: contents asString "i.e., the label" + in: labelBounds + font: self fontToUse + color: self colorToUse.! Item was changed: ----- Method: IndentingListItemMorph>>drawOn: (in category 'drawing') ----- drawOn: aCanvas + | tRect sRect | - | tRect sRect columnScanner columnLeft | self backgroundColor ifNotNil: [:c | aCanvas fillRectangle: self innerBounds color: c]. tRect := self toggleRectangle. self drawToggleOn: aCanvas in: tRect. sRect := bounds withLeft: tRect right + self hMargin. sRect := sRect top: sRect top + sRect bottom - self fontToUse height // 2. + (container columns isNil or: [(contents asString indexOf: Character tab) = 0]) + ifTrue: [self drawLabelOn: aCanvas in: sRect] + ifFalse: [self drawLabelInColumnsOn: aCanvas in: sRect].! - (container columns isNil or: [(contents asString indexOf: Character tab) = 0]) ifTrue: [ - icon ifNotNil: [ - aCanvas - translucentImage: icon - at: sRect left @ (self top + (self height - icon height // 2)). - sRect := sRect left: sRect left + icon width + 2. - ]. - - aCanvas drawString: contents asString in: sRect font: self fontToUse color: self colorToUse. - - ] ifFalse: [ - columnLeft := sRect left. - columnScanner := ReadStream on: contents asString. - container columns withIndexDo: [ :widthSpec :column | | columnRect columnData columnWidth | - "Draw icon." - column = self class iconColumnIndex ifTrue: [ - icon ifNotNil: [ - aCanvas - translucentImage: icon - at: columnLeft @ (self top + (self height - icon height // 2)). - columnLeft := columnLeft + icon width + 2]]. - - columnWidth := self widthOfColumn: column. - columnRect := columnLeft @ sRect top extent: columnWidth @ sRect height. - columnData := columnScanner upTo: Character tab. - - "Draw string." - columnData ifNotEmpty: [ - aCanvas drawString: columnData in: columnRect font: self fontToUse color: self colorToUse]. - - "Compute next column offset." - columnLeft := columnRect right + 5. - column = 1 ifTrue: [columnLeft := columnLeft - tRect right + self left]. - - ]. - ]!

1 0

The Trunk: Morphic-mt.2072.mcz
by commits＠source.squeak.org 24 Jan '23

24 Jan '23

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.2072.mcz ==================== Summary ==================== Name: Morphic-mt.2072 Author: mt Time: 24 January 2023, 11:39:47.83621 am UUID: 45500a78-1bff-da4d-8179-816f7a2ef27c Ancestors: Morphic-mt.2071 Complement EToys-mt.492 =============== Diff against Morphic-mt.2071 =============== Item was removed: - MenuMorph subclass: #DumberMenuMorph - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'Morphic-Explorer'! - - !DumberMenuMorph commentStamp: '<historical>' prior: 0! - Contributed by Bob Arning as part of the ObjectExplorer package. - ! Item was removed: - ----- Method: DumberMenuMorph>>setInvokingView: (in category 'menu') ----- - setInvokingView: invokingView - "I'd rather not, if that's OK"!

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Packages January 2023