Packages February 2022

packages@lists.squeakfoundation.org

1 participants
200 discussions

The Trunk: Morphic-mt.1872.mcz
by commits＠source.squeak.org 05 Feb '22

05 Feb '22

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.1872.mcz ==================== Summary ==================== Name: Morphic-mt.1872 Author: mt Time: 5 February 2022, 7:53:02.061366 pm UUID: 0f21c94a-93e6-a04b-b018-c372c3c8d0d2 Ancestors: Morphic-mt.1871 Fixes regression in FontImporterTool regarding #selectedFontTextStyle and its compatibility with #isSymbolFont. =============== Diff against Morphic-mt.1871 =============== Item was changed: ----- Method: FontImporterTool>>selectedFontTextStyle (in category 'font list') ----- selectedFontTextStyle + | font | + ^ (font := self selectedFont) isSymbolFont + ifFalse: [TextStyle fontArray: {font}] + ifTrue: [TextStyle default copy]! - ^ TextStyle fontArray: {self selectedFont}!

1 0

The Trunk: TrueType-mt.63.mcz
by commits＠source.squeak.org 05 Feb '22

05 Feb '22

Marcel Taeumel uploaded a new version of TrueType to project The Trunk: http://source.squeak.org/trunk/TrueType-mt.63.mcz ==================== Summary ==================== Name: TrueType-mt.63 Author: mt Time: 5 February 2022, 7:51:30.426366 pm UUID: 30e76ca2-1832-f442-9463-e9168ba20851 Ancestors: TrueType-mt.62 Let TrueType fonts report accurately on #minCodePoint and #maxCodePoint. We might want to make both a quick-return. Hmm... =============== Diff against TrueType-mt.62 =============== Item was changed: AbstractFont subclass: #TTCFont + instanceVariableNames: 'ttcDescription pointSize foregroundColor cache derivatives fallbackFont height ascent descent colorToCacheMap lineGap lineGapSlice minCodePoint maxCodePoint' - instanceVariableNames: 'ttcDescription pointSize foregroundColor cache derivatives fallbackFont height ascent descent maxAscii colorToCacheMap lineGap lineGapSlice' classVariableNames: 'GlyphCacheData GlyphCacheIndex GlyphCacheReady GlyphCacheSize NamesToIndexes Registry Scale ShutdownList' poolDictionaries: '' category: 'TrueType-Fonts'! !TTCFont commentStamp: 'nk 4/2/2004 11:32' prior: 0! I represent a font that uses TrueType derived glyph. Upon a request for glyph for a character through a call to #formOf: (or #widthOf:), I first search corresponding glyph in the cache. If there is not, it creates a 32bit depth form with the glyph. The cache is weakly held. The entries are zapped at full GC. Structure: ttcDescription TTFontDescription -- The Squeak data structure for a TrueType font data file. pointSize Number -- Nominal Em size in points. Conversion to pixel sizes depends on the definition of TextStyle class>>pixelsPerInch. foregroundColor Color -- So far, this font need to know the glyph color in cache. cache WeakArray of <Color -> <Array(256) of glyph>> derivatives Array -- stores the fonts in the same family but different emphasis. ! Item was added: + ----- Method: TTCFont>>isSymbolFont (in category 'testing') ----- + isSymbolFont + + ^ (self hasGlyphOf: $a) not! Item was changed: ----- Method: TTCFont>>maxCodePoint (in category 'accessing') ----- maxCodePoint + ^ maxCodePoint ifNil: [maxCodePoint := ((ttcDescription size - 1 to: 0 by: -1) + detect: [:ea | (ttcDescription at: ea) isFallback not] ifNone: [0])]! - ^maxAscii ifNil: [ttcDescription size - 1]! Item was added: + ----- Method: TTCFont>>minCodePoint (in category 'accessing') ----- + minCodePoint + + ^ minCodePoint ifNil: [minCodePoint := (0 to: ttcDescription size - 1) + detect: [:ea | (ttcDescription at: ea) isFallback not] ifNone: [1]]!

1 0

The Trunk: Graphics-mt.475.mcz
by commits＠source.squeak.org 05 Feb '22

05 Feb '22

Marcel Taeumel uploaded a new version of Graphics to project The Trunk: http://source.squeak.org/trunk/Graphics-mt.475.mcz ==================== Summary ==================== Name: Graphics-mt.475 Author: mt Time: 5 February 2022, 7:48:58.382366 pm UUID: 646ee472-f5b8-9e4d-a5ec-329115e16e83 Ancestors: Graphics-mt.474 Modify #sampleText to consider the font's available code points. =============== Diff against Graphics-mt.474 =============== Item was changed: ----- Method: AbstractFont>>sampleText (in category 'example') ----- sampleText | text | text := (self isSymbolFont or: [(self basicHasGlyphOf: $a) not]) + ifTrue: [self symbolSample asText] - ifTrue: [Text symbolSample] ifFalse: [Text textSample]. text addAttribute: (TextFontReference toFont: self). ^ text! Item was added: + ----- Method: AbstractFont>>symbolSample (in category 'example') ----- + symbolSample + "Variation of Text class >> #symbolSample, which uses the receiver's available code points. This is important for fonts such as Wingdings." + + ^ String streamContents: [:stream | | start lineLength character | + lineLength := 0. + (start := self minCodePoint max: 33) to: (self maxCodePoint min: start + 200) do: [:codePoint | + (self hasGlyphOf: (character := Character value: codePoint)) + ifTrue: [stream nextPut: character. + ((lineLength := lineLength + 1) > 30) ifTrue: [ + lineLength := 0. + stream cr]]]]!

1 0

The Trunk: Graphics-mt.474.mcz
by commits＠source.squeak.org 05 Feb '22

05 Feb '22

Marcel Taeumel uploaded a new version of Graphics to project The Trunk: http://source.squeak.org/trunk/Graphics-mt.474.mcz ==================== Summary ==================== Name: Graphics-mt.474 Author: mt Time: 5 February 2022, 6:56:41.83018 pm UUID: 3a42eb99-d489-124d-bced-7310a979dbe1 Ancestors: Graphics-mt.473 Fixes endless recursion issue for fonts that do not answer "true" for #hasGlyphOf: for their #minCodePoint. =============== Diff against Graphics-mt.473 =============== Item was changed: ----- Method: FixedFaceFont>>baseFont: (in category 'accessing') ----- baseFont: aFont baseFont := aFont. + self fixSubstitutionCharacter.! - substitutionCharacter ifNotNil: [ - substitutionCharacter := substitutionCharacter max: self minSubstitutionCharacter].! Item was changed: ----- Method: FixedFaceFont>>errorFont (in category 'initialize-release') ----- errorFont displaySelector := #displayErrorOn:length:at:kern:baselineY:. + substitutionCharacter := self errorCharacter. + self fixSubstitutionCharacter.! - substitutionCharacter := self errorCharacter max: self minSubstitutionCharacter.! Item was added: + ----- Method: FixedFaceFont>>fixSubstitutionCharacter (in category 'private') ----- + fixSubstitutionCharacter + + substitutionCharacter ifNil: [^ self]. + baseFont ifNil: [^ self]. + (baseFont hasGlyphOf: substitutionCharacter) ifTrue: [^ self]. + + (baseFont minCodePoint to: baseFont maxCodePoint) + detect: [:codePoint | baseFont hasGlyphOf: (Character value: codePoint)] + ifFound: [:codePoint | substitutionCharacter := Character value: codePoint] + ifNone: [ + baseFont := TextStyle defaultFont. + substitutionCharacter := $?]. + self + assert: [baseFont hasGlyphOf: substitutionCharacter] + description: 'Could not find a possible substitution character and font!!'.! Item was changed: ----- Method: FixedFaceFont>>passwordFont (in category 'initialize-release') ----- passwordFont displaySelector := #displayPasswordOn:length:at:kern:baselineY:. + substitutionCharacter := self passwordCharacter. + self fixSubstitutionCharacter.! - substitutionCharacter := self passwordCharacter max: self minSubstitutionCharacter.!

1 0

The Trunk: Morphic-mt.1871.mcz
by commits＠source.squeak.org 05 Feb '22

05 Feb '22

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.1871.mcz ==================== Summary ==================== Name: Morphic-mt.1871 Author: mt Time: 5 February 2022, 5:50:07.252947 pm UUID: ace9011c-de05-9846-b208-cccb9d5232a8 Ancestors: Morphic-mt.1870 Adds support for font changes in list items. Use it to spice up the "set style..." dialog in text fields. =============== Diff against Morphic-mt.1870 =============== Item was changed: ----- Method: LazyListMorph>>display:atRow:on: (in category 'drawing') ----- display: item atRow: row on: canvas "display the given item at row row" | drawBounds leading emphasized rowColor itemAsText alignment | itemAsText := item asStringOrText. alignment := self cellPositioning. "If it is a text, we will only use the first character's emphasis." + emphasized := itemAsText isText + ifFalse: [ font "fast path" ] + ifTrue: [ "Note that a font change may interfere with the receiver's uniform item height." + (itemAsText + fontAt: 1 withDefault: font) + emphasized: (itemAsText emphasisAt: 1)]. - emphasized := itemAsText isText - ifTrue: [font emphasized: (itemAsText emphasisAt: 1)] - ifFalse: [font]. rowColor := itemAsText isText ifTrue: [itemAsText colorAt: 1 ifNone: [self colorForRow: row]] ifFalse: [self colorForRow: row]. drawBounds := self drawBoundsForRow: row. alignment ~= #leftCenter ifTrue: [ | itemWidth | itemWidth := self widthToDisplayItem: item. "includes left/right margins" alignment == #center ifTrue: [ drawBounds := (self center x - (itemWidth / 2) floor) @ drawBounds top corner: (self center x + (itemWidth / 2) ceiling) @ drawBounds bottom]. alignment == #rightCenter ifTrue: [ drawBounds := (self right - itemWidth) @ drawBounds top corner: self right @ drawBounds bottom]]. "Draw icon if existing. Adjust draw bounds in that case." drawBounds := drawBounds translateBy: (self cellInset left @ 0). (self icon: row) ifNotNil: [ :icon || top | top := drawBounds top + ((drawBounds height - self iconExtent y) // 2). canvas translucentImage: icon at: drawBounds left @ top. drawBounds := drawBounds left: drawBounds left + self iconExtent x + self cellInset left ]. "We will only draw strings here." leading := emphasized lineGapSliceForMorphs. "look vertically centered" drawBounds := drawBounds translateBy: (0 @ self cellInset top). canvas drawString: itemAsText asString in: (drawBounds origin + (0 @ leading) corner: drawBounds corner) font: emphasized color: rowColor. "Draw filter matches if any." self displayFilterOn: canvas for: row in: drawBounds font: emphasized.! Item was changed: ----- Method: TextEditor>>changeStyle (in category 'attributes') ----- changeStyle "Let user change styles for the current text pane." - | names reply style current menuList | + | known knownTTCStyles knownLegacyStyles defaultStyles + newStyle current currentName menuList | current := morph textStyle. + currentName := current defaultFamilyName. + + knownTTCStyles := ((TextStyle actualTextStyles select: [:ea | ea isTTCStyle]) + sorted: [:a :b | a defaultFamilyName <= b defaultFamilyName]) + collect: [:ea | ea defaultFamilyName -> ea] as: OrderedDictionary. + knownLegacyStyles := ((TextStyle actualTextStyles reject: [:ea | ea isTTCStyle]) + sorted: [:a :b | a defaultFamilyName <= b defaultFamilyName]) + collect: [:ea | ea defaultFamilyName -> ea] as: OrderedDictionary. + defaultStyles := ((TextStyle defaultFamilyNames + collect: [:ea | ea -> (TextStyle named: ea)] as: OrderedDictionary) + reject: [:ea | ea isNil "undefined default styles"]) + sorted: [:a :b | a key <= b key]. + + known := defaultStyles, {'---' -> nil}, knownTTCStyles, {'--- ' -> nil}, knownLegacyStyles. + menuList := Array streamContents: [:s | + known keysAndValuesDo: [ :knownName :knownStyle | + s nextPut: (((knownStyle notNil and: [knownStyle defaultFamilyName = currentName]) + ifTrue: [ (' > ', knownName, ' (current)' translated) asText ] + ifFalse: [ knownName asText ]) addAttribute: (TextFontReference toFont: (knownStyle ifNil: [TextStyle default])defaultFont); yourself)]]. + known := known values. + newStyle := Project uiManager chooseFrom: menuList values: known. + newStyle ifNotNil: [morph textStyle: newStyle copy]. - names := TextStyle knownTextStyles. - menuList := names collect: [ :styleName | - styleName = current name - ifTrue: [ '<on>', styleName ] - ifFalse: [ '<off>', styleName ]]. - reply := Project uiManager chooseFrom: menuList values: names. - reply ifNotNil: [ - (style := TextStyle named: reply) ifNil: [Beeper beep. ^ true]. - morph textStyle: style copy]. ^ true!

1 0

The Trunk: Collections-mt.986.mcz
by commits＠source.squeak.org 05 Feb '22

05 Feb '22

Marcel Taeumel uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-mt.986.mcz ==================== Summary ==================== Name: Collections-mt.986 Author: mt Time: 5 February 2022, 5:48:06.324947 pm UUID: 843f8169-dc62-4847-b3eb-49233199a905 Ancestors: Collections-cmm.985 Adds a cheap way to lookup the font at a character index in a text without having to have a text style at hand. This is useful for TextFontReference. See #fontAt:withStyle:. =============== Diff against Collections-cmm.985 =============== Item was added: + ----- Method: Text>>fontAt:withDefault: (in category 'emphasis') ----- + fontAt: characterIndex withDefault: aFont + "Answer the font for characters in the run beginning at characterIndex." + + | attributes font | + self size = 0 ifTrue: [^ aFont]. "null text tolerates access" + attributes := runs atPin: characterIndex. + font := aFont. "default" + attributes do: [:att | att forFontInStyle: nil do: [:f | font := f]]. + ^ font! Item was changed: ----- Method: TextFontChange>>forFontInStyle:do: (in category 'private') ----- + forFontInStyle: aTextStyleOrNil do: aBlock + + ^ aTextStyleOrNil ifNotNil: [aBlock value: (aTextStyleOrNil fontAt: fontNumber)]! - forFontInStyle: aTextStyle do: aBlock - aBlock value: (aTextStyle fontAt: fontNumber)!

1 0

The Trunk: PreferenceBrowser-mt.129.mcz
by commits＠source.squeak.org 05 Feb '22

05 Feb '22

Marcel Taeumel uploaded a new version of PreferenceBrowser to project The Trunk: http://source.squeak.org/trunk/PreferenceBrowser-mt.129.mcz ==================== Summary ==================== Name: PreferenceBrowser-mt.129 Author: mt Time: 5 February 2022, 4:23:52.931491 pm UUID: e2046d52-8f28-5a4c-a06c-f52565e92de2 Ancestors: PreferenceBrowser-mt.128 Adds new #useCompactLists preference to wizard in case people are worried that Squeak now looks "too spacey" :-) =============== Diff against PreferenceBrowser-mt.128 =============== Item was changed: ----- Method: PreferenceWizardMorph>>initializePage02Visuals (in category 'initialization - pages') ----- initializePage02Visuals | currentPage pane | currentPage := pages add: self createPage. pane := self createScrollPane. currentPage addMorphBack: (self createLabel: 'Choose visual settings' color: Color white). currentPage addMorphBack: pane. pane scroller firstSubmorph addAllMorphsBack: { self createCheckbox: 'Colorful windows' translated for: #UseColorfulWindows help: #(color window). self createCheckbox: 'Flat widget look' translated for: #Gradients help: 'Whether to use gradients or not.' translated. self createVerticalSpace. self createCheckbox: 'Rounded windows' translated for: #RoundedWindowLook help: #(round window). self createCheckbox: 'Rounded buttons' translated for: #RoundedButtonLook help: #(round button). self createVerticalSpace. self createCheckbox: 'Soft shadows' translated for: #SoftShadows help: #(soft shadow). self createCheckbox: 'Hard shadows' translated for: #HardShadows help: 'Whether to use a hard shadow for windows, menus, and dialogs.' translated. self createVerticalSpace. self createCheckbox: 'Fast drag and resize' translated for: #FastDrag help: #(fast drag). self createCheckbox: 'Blinking text cursor' translated for: #BlinkingCursor help: #(blinking cursor). self createCheckbox: 'Show keyboard focus' translated for: #ShowKeyboardFocus help: #(keyboard indicate). + self createCheckbox: 'Simple edit indication' translated for: #SimpleFrameAdornments help: #(adornment simple). + self createCheckbox: 'Compact list widgets' translated for: #UseCompactLists help: #(compact list). - self createCheckbox: 'Simple edit indication' translated for: #SimpleFrameAdornments help: #(adornment simple). }.! Item was added: + ----- Method: PreferenceWizardMorph>>stateUseCompactLists (in category 'actions - buttons') ----- + stateUseCompactLists + + ^ MorphicProject useCompactLists! Item was added: + ----- Method: PreferenceWizardMorph>>toggleUseCompactLists (in category 'actions - buttons') ----- + toggleUseCompactLists + + MorphicProject useCompactLists: MorphicProject useCompactLists not. + self changed: #stateUseCompactLists.!

1 0

The Trunk: ToolBuilder-Morphic-mt.293.mcz
by commits＠source.squeak.org 05 Feb '22

05 Feb '22

Marcel Taeumel uploaded a new version of ToolBuilder-Morphic to project The Trunk: http://source.squeak.org/trunk/ToolBuilder-Morphic-mt.293.mcz ==================== Summary ==================== Name: ToolBuilder-Morphic-mt.293 Author: mt Time: 5 February 2022, 4:22:47.953491 pm UUID: 51aa77d7-6bc2-cf41-a8f9-ec8ab4142d32 Ancestors: ToolBuilder-Morphic-mt.292 First try to fix position of help text in text fields. There is still something wrong with the vertical offset, which you will notice at some #uiScaleFactor's. =============== Diff against ToolBuilder-Morphic-mt.292 =============== Item was changed: ----- Method: PluggableTextMorphPlus>>drawBalloonTextOn: (in category 'drawing') ----- drawBalloonTextOn: aCanvas "Show balloon text in the text morph if it has no contents." textMorph contents ifNotEmpty: [ ^ self ]. ([ self balloonText ] on: Error do: [ : err | 'error in balloonText' ]) ifNotNil: + [ : text | | font box | + font := self userInterfaceTheme balloonTextFont ifNil: [TextStyle defaultFont]. + box := self bounds insetBy: (self textMorph margins ifNil: [0]). + box := box insetBy: (0 @ font lineGapSlice corner: 0@0). + aCanvas + drawString: text + in: box + font: font + color: (self userInterfaceTheme balloonTextColor ifNil: [Color gray: 0.7]) ]! - [ : text | aCanvas - drawString: text - in: (self innerBounds insetBy: (5 @ 2 corner: 0 @ 0)) - font: (self userInterfaceTheme balloonTextFont ifNil: [TextStyle defaultFont]) - color: (self userInterfaceTheme balloonTextColor ifNil: [Color gray: 0.7]) ]!

1 0

The Trunk: Morphic-mt.1870.mcz
by commits＠source.squeak.org 05 Feb '22

05 Feb '22

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.1870.mcz ==================== Summary ==================== Name: Morphic-mt.1870 Author: mt Time: 5 February 2022, 4:20:57.225491 pm UUID: 7a906266-c964-6d43-8810-a1722667db19 Ancestors: Morphic-mt.1869 Makes use of #lineGridForMorphs and #lineGapSliceForMorphs via #useCompactLists preference. Note that our lists do now use a list font's #lineGap by default to give it more breathing space on screen. If you do not like this, you can enable #useCompactLists:. Note that some TrueType fonts, however, depend on lists to leave some space for their font features. See #extraScale and #extraGap to configure this for your favorite font, imported via FontImporterTool. =============== Diff against Morphic-mt.1869 =============== Item was changed: ----- Method: IndentingListItemMorph>>minHeight (in category 'layout') ----- minHeight | iconHeight | iconHeight := self hasIcon ifTrue: [self icon height + 2] ifFalse: [0]. + ^ self fontToUse lineGridForMorphs max: iconHeight ! - ^ self fontToUse height max: iconHeight ! Item was changed: ----- Method: LazyListMorph>>display:atRow:on: (in category 'drawing') ----- display: item atRow: row on: canvas "display the given item at row row" + | drawBounds leading emphasized rowColor itemAsText alignment | - | drawBounds emphasized rowColor itemAsText alignment | itemAsText := item asStringOrText. alignment := self cellPositioning. "If it is a text, we will only use the first character's emphasis." emphasized := itemAsText isText ifTrue: [font emphasized: (itemAsText emphasisAt: 1)] ifFalse: [font]. rowColor := itemAsText isText ifTrue: [itemAsText colorAt: 1 ifNone: [self colorForRow: row]] ifFalse: [self colorForRow: row]. drawBounds := self drawBoundsForRow: row. alignment ~= #leftCenter ifTrue: [ | itemWidth | itemWidth := self widthToDisplayItem: item. "includes left/right margins" alignment == #center ifTrue: [ drawBounds := (self center x - (itemWidth / 2) floor) @ drawBounds top corner: (self center x + (itemWidth / 2) ceiling) @ drawBounds bottom]. alignment == #rightCenter ifTrue: [ drawBounds := (self right - itemWidth) @ drawBounds top corner: self right @ drawBounds bottom]]. "Draw icon if existing. Adjust draw bounds in that case." drawBounds := drawBounds translateBy: (self cellInset left @ 0). (self icon: row) ifNotNil: [ :icon || top | top := drawBounds top + ((drawBounds height - self iconExtent y) // 2). canvas translucentImage: icon at: drawBounds left @ top. + drawBounds := drawBounds left: drawBounds left + self iconExtent x + self cellInset left ]. - drawBounds := drawBounds left: drawBounds left + self iconExtent x + 2 ]. "We will only draw strings here." + leading := emphasized lineGapSliceForMorphs. "look vertically centered" drawBounds := drawBounds translateBy: (0 @ self cellInset top). canvas drawString: itemAsText asString + in: (drawBounds origin + (0 @ leading) corner: drawBounds corner) - in: drawBounds font: emphasized color: rowColor. "Draw filter matches if any." self displayFilterOn: canvas for: row in: drawBounds font: emphasized.! Item was changed: ----- Method: LazyListMorph>>displayFilterOn:for:in:font: (in category 'drawing') ----- displayFilterOn: canvas for: row in: drawBounds font: font "Draw filter matches if any." + | fillStyle fillHeight leading | - | fillStyle fillHeight | self showFilter ifFalse: [^ self]. + fillHeight := font lineGridForMorphs. - fillHeight := font height. fillStyle := self filterColor isColor ifTrue: [SolidFillStyle color: self filterColor] ifFalse: [self filterColor]. fillStyle isGradientFill ifTrue: [ fillStyle origin: drawBounds topLeft. fillStyle direction: 0@ fillHeight]. + leading := font lineGapSliceForMorphs. + (self filterOffsets: row) do: [:offset | | highlightRectangle | highlightRectangle := ((drawBounds left + offset first first) @ drawBounds top corner: (drawBounds left + offset first last) @ (drawBounds top + fillHeight)). canvas frameAndFillRoundRect: (highlightRectangle outsetBy: 1@0) radius: (3 * RealEstateAgent scaleFactor) truncated fillStyle: fillStyle borderWidth: (1 * RealEstateAgent scaleFactor) truncated borderColor: fillStyle asColor twiceDarker. canvas drawString: offset second + in: (highlightRectangle origin + (0 @ leading) corner: highlightRectangle corner) - in: highlightRectangle font: font color: self filterTextColor].! Item was changed: ----- Method: LazyListMorph>>rowHeight (in category 'layout') ----- rowHeight + ^ font lineGridForMorphs + self cellInset top + self cellInset bottom! - ^ font height + self cellInset top + self cellInset bottom! Item was changed: ----- Method: LazyListMorph>>widthToDisplayItem: (in category 'layout') ----- widthToDisplayItem: item | labelWidth iconWidth leftMargin rightMargin | - labelWidth := self font widthOfStringOrText: item asStringOrText. - iconWidth := self listSource canHaveIcons ifTrue: [self iconExtent x] ifFalse: [0]. leftMargin := self cellInset left. rightMargin := self cellInset right. + labelWidth := self font widthOfStringOrText: item asStringOrText. + iconWidth := self listSource canHaveIcons ifTrue: [self iconExtent x + leftMargin] ifFalse: [0]. ^ leftMargin + iconWidth + labelWidth + rightMargin! Item was changed: ----- Method: MenuItemMorph>>drawLabelOn: (in category 'drawing') ----- drawLabelOn: aCanvas | stringBounds | stringBounds := self bounds. self hasIcon ifTrue: [ stringBounds := stringBounds left: stringBounds left + self iconForm width + 2 ]. self hasMarker ifTrue: [ stringBounds := stringBounds left: stringBounds left + self submorphBounds width + 8 ]. - stringBounds := stringBounds top: stringBounds top + stringBounds bottom - self fontToUse height // 2. - aCanvas drawString: self contents + at: stringBounds left @ (stringBounds center y - (self fontToUse height // 2)) - in: stringBounds font: self fontToUse color: self colorToUse.! Item was changed: ----- Method: MenuItemMorph>>minHeight (in category 'layout') ----- minHeight | iconHeight | iconHeight := self hasIcon ifTrue: [self icon height + 2] ifFalse: [0]. + ^ self fontToUse lineGridForMorphs max: iconHeight! - ^ self fontToUse height + 2 max: iconHeight! Item was changed: ----- Method: PluggableButtonMorph>>updateMinimumExtent (in category 'layout') ----- updateMinimumExtent | hMin vMin | self label isMorph ifTrue: [^ self minimumExtent: self label minExtent]. hMin := vMin := 0. self hResizing ~~ #spaceFill ifTrue: [hMin := (self font widthOfString: self label) max: (self font widthOf: $x) * 3]. self vResizing ~~ #spaceFill + ifTrue: [vMin := self font lineGridForMorphs]. - ifTrue: [vMin := self font height]. hMin := hMin + (2* self borderStyle width). vMin := vMin + (2* self borderStyle width). self layoutInset isRectangle ifTrue: [ hMin := hMin + self layoutInset left + self layoutInset right. vMin := vMin + self layoutInset top + self layoutInset bottom] ifFalse: [self layoutInset isPoint ifTrue: [ hMin := hMin + (2* self layoutInset x). vMin := vMin + (2* self layoutInset y)] ifFalse: [ hMin := hMin + (2* self layoutInset). vMin := vMin + (2* self layoutInset)]]. self minimumExtent: hMin @ vMin. "Since we have no submorphs, we have to resize here if we want to shrink wrap." self hResizing == #shrinkWrap ifTrue: [self width: hMin]. self vResizing == #shrinkWrap ifTrue: [self height: vMin].! Item was changed: ----- Method: StringMorph>>drawOn: (in category 'drawing') ----- drawOn: aCanvas aCanvas drawString: self contents + in: self innerBounds - in: self bounds font: self fontToUse color: self color.! Item was added: + ----- Method: StringMorph>>innerBounds (in category 'geometry - layout') ----- + innerBounds + "Overwritten to respect the receiver's font's #lineGap." + + | b | + b := super innerBounds. + ^ b origin + (0 @ self fontToUse lineGapSliceForMorphs) corner: b corner! Item was changed: ----- Method: StringMorph>>measureContents (in category 'accessing - support') ----- measureContents | f | f := self fontToUse. + ^(((f widthOfString: contents) max: self minimumWidth) @ f lineGridForMorphs).! - ^(((f widthOfString: contents) max: self minimumWidth) @ f height).! Item was changed: ----- Method: StringMorph>>minHeight (in category 'layout') ----- minHeight "Layout specific." + ^ super minHeight max: self fontToUse lineGridForMorphs! - ^ super minHeight max: self fontToUse height! Item was changed: ----- Method: StringMorph>>setWidth: (in category 'accessing - support') ----- setWidth: width + self extent: width @ self height! - self extent: width @ (font ifNil: [TextStyle defaultFont]) height! Item was changed: + (PackageInfo named: 'Morphic') postscript: '"Apply new useCompactLists property." + MorphicProject useCompactLists: false.'! - (PackageInfo named: 'Morphic') postscript: '"Clear cache of blank icons" - MenuIcons cleanUp: true. - "Fixes height of all window titles." - SystemWindow allSubInstancesDo: [:wnd | wnd replaceBoxes]. - "Rebuild docking bar menus." - TheWorldMainDockingBar updateInstances.'!

1 0

The Trunk: ST80-mt.275.mcz
by commits＠source.squeak.org 05 Feb '22

05 Feb '22

Marcel Taeumel uploaded a new version of ST80 to project The Trunk: http://source.squeak.org/trunk/ST80-mt.275.mcz ==================== Summary ==================== Name: ST80-mt.275 Author: mt Time: 5 February 2022, 4:18:17.525491 pm UUID: be7f7c64-0231-0b49-92d7-fe86a3464e1d Ancestors: ST80-mt.274 Complements Graphics-mt.473 =============== Diff against ST80-mt.274 =============== Item was changed: ----- Method: CompositionScanner>>composeLine:fromCharacterIndex:inParagraph: (in category '*ST80-Support') ----- composeLine: lineIndex fromCharacterIndex: startIndex inParagraph: aParagraph "Answer an instance of TextLineInterval that represents the next line in the paragraph." | runLength stopCondition | destX := spaceX := leftMargin := aParagraph leftMarginForCompositionForLine: lineIndex. destY := 0. rightMargin := aParagraph rightMarginForComposition. leftMargin >= rightMargin ifTrue: [self error: 'No room between margins to compose']. lastIndex := startIndex. "scanning sets last index" lineHeight := textStyle lineGrid. "may be increased by setFont:..." baseline := textStyle baseline. self setStopConditions. "also sets font" self handleIndentation. runLength := text runLengthFor: startIndex. runStopIndex := (lastIndex := startIndex) + (runLength - 1). line := TextLineInterval start: lastIndex stop: 0 internalSpaces: 0 paddingWidth: 0. nextIndexAfterLineBreak := spaceCount := 0. lastBreakIsNotASpace := false. [stopCondition := self scanCharactersFrom: lastIndex to: runStopIndex in: text string rightX: rightMargin. "See setStopConditions for stopping conditions for composing." self perform: stopCondition] whileFalse. ^line lineHeight: lineHeight + textStyle leading + baseline: baseline + textStyle leadingSlice! - baseline: baseline + textStyle leading!

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 February 2022