Squeak-dev August 2023

squeak-dev@lists.squeakfoundation.org

30 participants
163 discussions

The Trunk: Morphic-mt.2117.mcz
by commits＠source.squeak.org 02 Aug '23

02 Aug '23

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.2117.mcz ==================== Summary ==================== Name: Morphic-mt.2117 Author: mt Time: 2 August 2023, 1:52:09.534767 pm UUID: 10c56f5d-2659-7347-aeef-1f33be124e2e Ancestors: Morphic-mt.2116 Do not show layout options for text morphs that are embedded in a view since that view governs those properties only. =============== Diff against Morphic-mt.2116 =============== Item was changed: ----- Method: TextMorph>>addCustomMenuItems:hand: (in category 'menu') ----- addCustomMenuItems: aCustomMenu hand: aHandMorph - | outer | - super addCustomMenuItems: aCustomMenu hand: aHandMorph. - aCustomMenu add: 'text properties...' translated action: #changeTextColor. - aCustomMenu addUpdating: #autoFitString target: self action: #autoFitOnOff. - aCustomMenu addUpdating: #wrapString target: self action: #wrapOnOff. - aCustomMenu add: 'text margins...' translated action: #changeMargins:. - aCustomMenu add: 'add predecessor' translated action: #addPredecessor:. - aCustomMenu add: 'add successor' translated action: #addSuccessor:. + super addCustomMenuItems: aCustomMenu hand: aHandMorph. + self addCustomTextMenuItems: aCustomMenu hand: aHandMorph. - outer := self owner. - outer ifNotNil: [ - outer isLineMorph ifTrue: - [container isNil - ifTrue: [Smalltalk at: #TextOnCurveContainer ifPresent: [:ignored | aCustomMenu add: 'follow owner''s curve' translated action: #followCurve]] - ifFalse: [aCustomMenu add: 'reverse direction' translated action: #reverseCurveDirection. - aCustomMenu add: 'set baseline' translated action: #setCurveBaseline:]] - ifFalse: - [self fillsOwner - ifFalse: [aCustomMenu add: 'fill owner''s shape' translated action: #fillingOnOff] - ifTrue: [aCustomMenu add: 'rectangular bounds' translated action: #fillingOnOff]. - self avoidsOcclusions - ifFalse: [aCustomMenu add: 'avoid occlusions' translated action: #occlusionsOnOff] - ifTrue: [aCustomMenu add: 'ignore occlusions' translated action: #occlusionsOnOff]]]. - aCustomMenu addLine. - aCustomMenu add: 'holder for characters' translated action: #holderForCharacters ! Item was added: + ----- Method: TextMorph>>addCustomTextMenuItems:hand: (in category 'menu') ----- + addCustomTextMenuItems: aCustomMenu hand: aHandMorph + + | outer | + aCustomMenu add: 'text properties...' translated action: #changeTextColor. + aCustomMenu addUpdating: #autoFitString target: self action: #autoFitOnOff. + aCustomMenu addUpdating: #wrapString target: self action: #wrapOnOff. + aCustomMenu add: 'text margins...' translated action: #changeMargins:. + aCustomMenu add: 'add predecessor' translated action: #addPredecessor:. + aCustomMenu add: 'add successor' translated action: #addSuccessor:. + + outer := self owner. + outer ifNotNil: [ + outer isLineMorph ifTrue: + [container isNil + ifTrue: [Smalltalk at: #TextOnCurveContainer ifPresent: [:ignored | aCustomMenu add: 'follow owner''s curve' translated action: #followCurve]] + ifFalse: [aCustomMenu add: 'reverse direction' translated action: #reverseCurveDirection. + aCustomMenu add: 'set baseline' translated action: #setCurveBaseline:]] + ifFalse: + [self fillsOwner + ifFalse: [aCustomMenu add: 'fill owner''s shape' translated action: #fillingOnOff] + ifTrue: [aCustomMenu add: 'rectangular bounds' translated action: #fillingOnOff]. + self avoidsOcclusions + ifFalse: [aCustomMenu add: 'avoid occlusions' translated action: #occlusionsOnOff] + ifTrue: [aCustomMenu add: 'ignore occlusions' translated action: #occlusionsOnOff]]]. + aCustomMenu addLine. + aCustomMenu add: 'holder for characters' translated action: #holderForCharacters! Item was added: + ----- Method: TextMorphForEditView>>addCustomTextMenuItems:hand: (in category 'menu') ----- + addCustomTextMenuItems: aCustomMenu hand: aHandMorph + "Overwritten to not offer layouting options since this is managed through the receiver's view."!

1 0

The Trunk: MorphicExtrasTests-pre.8.mcz
by commits＠source.squeak.org 02 Aug '23

02 Aug '23

Patrick Rein uploaded a new version of MorphicExtrasTests to project The Trunk: http://source.squeak.org/trunk/MorphicExtrasTests-pre.8.mcz ==================== Summary ==================== Name: MorphicExtrasTests-pre.8 Author: pre Time: 2 August 2023, 12:22:48.107105 pm UUID: 5581e401-42d8-0b40-86ce-9055bf9b4139 Ancestors: MorphicExtrasTests-ct.7 Adds tests for GH #80: 'preserver trash' preference ceased to work. =============== Diff against MorphicExtrasTests-ct.7 =============== Item was changed: SystemOrganization addCategory: #'MorphicExtrasTests-Postscript Filters'! SystemOrganization addCategory: #'MorphicExtrasTests-Flaps'! SystemOrganization addCategory: #'MorphicExtrasTests-Postscript Canvases'! SystemOrganization addCategory: #'MorphicExtrasTests-Demo'! + SystemOrganization addCategory: #'MorphicExtrasTests-Widgets'! Item was added: + TestCase subclass: #TrashCanTest + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'MorphicExtrasTests-Widgets'! Item was added: + ----- Method: TrashCanTest>>performTest (in category 'running') ----- + performTest + + | previousSetting | + previousSetting := TrashCanMorph preserveTrash. + [TrashCanMorph preserveTrash: true. + ^ super performTest] + ensure: [TrashCanMorph preserveTrash: previousSetting]! Item was added: + ----- Method: TrashCanTest>>testLayoutingInScrapBook (in category 'tests') ----- + testLayoutingInScrapBook + + | morph newPage scrapBook | + scrapBook := ScrapBook new. + morph := RectangleMorph new. + scrapBook addToTrash: morph. + newPage := scrapBook scrapBook pages last. + self assert: (newPage submorphs includes: morph). + self assert: (morph position - newPage position) abs < (100@100). + ! Item was added: + ----- Method: TrashCanTest>>testPreserveTrashPreferenceOff (in category 'tests') ----- + testPreserveTrashPreferenceOff + + | previousSetting morph scrapBook | + previousSetting := TrashCanMorph preserveTrash. + [TrashCanMorph preserveTrash: false. + scrapBook := ScrapBook new. + morph := RectangleMorph new. + scrapBook addToTrash: morph. + self assert: 1 equals: scrapBook scrapBook pages size.] + ensure: [TrashCanMorph preserveTrash: previousSetting] + + ! Item was added: + ----- Method: TrashCanTest>>testPreserveTrashPreferenceOn (in category 'tests') ----- + testPreserveTrashPreferenceOn + + | previousSetting morph scrapBook | + previousSetting := TrashCanMorph preserveTrash. + [TrashCanMorph preserveTrash: true. + scrapBook := ScrapBook new. + morph := RectangleMorph new. + scrapBook addToTrash: morph. + self assert: 2 equals: scrapBook scrapBook pages size.] + ensure: [TrashCanMorph preserveTrash: previousSetting] + + ! Item was added: + ----- Method: TrashCanTest>>testTrashingAMorphAddsAPAge (in category 'tests') ----- + testTrashingAMorphAddsAPAge + + | morph scrapBook | + scrapBook := ScrapBook new. + morph := RectangleMorph new. + scrapBook addToTrash: morph. + self assert: 2 equals: scrapBook scrapBook pages size.!

1 0

The Trunk: MorphicExtras-pre.347.mcz
by commits＠source.squeak.org 02 Aug '23

02 Aug '23

Patrick Rein uploaded a new version of MorphicExtras to project The Trunk: http://source.squeak.org/trunk/MorphicExtras-pre.347.mcz ==================== Summary ==================== Name: MorphicExtras-pre.347 Author: pre Time: 2 August 2023, 12:22:24.143105 pm UUID: f1c0db45-d2f7-1a4c-b433-7f71b4a01688 Ancestors: MorphicExtras-mt.346 Fixes GH #80: 'preserver trash' preference ceased to work The preference continued to work but the trash book morph pages were layouted incorrectly, as layouting new requires a fullBounds computation. Setting the position does not suffice anymore. This might be a candidate for backporting to 6.0 as it breaks working interactively with morphs. =============== Diff against MorphicExtras-mt.346 =============== Item was changed: ----- Method: BookMorph>>insertPageLabel:morphs: (in category 'insert and delete') ----- insertPageLabel: labelString morphs: morphList | m c labelAllowance | self insertPage. + labelString + ifNotNil: [ + m := labelString asMorph. + m + lock; + position: currentPage position + (((currentPage width - m width) // 2) @ 5). + currentPage addMorph: m. + labelAllowance := 40] + ifNil: [labelAllowance := 0]. - labelString ifNotNil: - [m := labelString asMorph. - m lock. - m position: currentPage position + (((currentPage width - m width) // 2) @ 5). - currentPage addMorph: m. - labelAllowance := 40] - ifNil: - [labelAllowance := 0]. "use a column to align the given morphs, then add them to the page" c := AlignmentMorph newColumn wrapCentering: #center; cellPositioning: #topCenter. c addAllMorphs: morphList. c position: currentPage position + (0 @ labelAllowance). + c fullBounds. "enforce layouting" currentPage addAllMorphs: morphList. ^ currentPage !

1 0

Jump to page: