Packages December 2021

packages@lists.squeakfoundation.org

1 participants
270 discussions

The Trunk: PreferenceBrowser-mt.124.mcz
by commits＠source.squeak.org 31 Dec '21

31 Dec '21

Marcel Taeumel uploaded a new version of PreferenceBrowser to project The Trunk: http://source.squeak.org/trunk/PreferenceBrowser-mt.124.mcz ==================== Summary ==================== Name: PreferenceBrowser-mt.124 Author: mt Time: 31 December 2021, 9:45:05.003725 am UUID: 2bcd047d-e488-a248-b512-ef43d4611855 Ancestors: PreferenceBrowser-mt.123 Allow users to experiment with various scale factors in the wizard, which requires to hide some static texts to be able to click on 100% again after trying, e.g., 300%. =============== Diff against PreferenceBrowser-mt.123 =============== Item was changed: ----- Method: PreferenceWizardMorph>>step (in category 'stepping') ----- step + | oldBounds | - | oldWidth oldBounds | "self comeToFront." isFullScreen == true ifTrue: [ oldBounds := self bounds. self bounds: self world bounds. self bounds = oldBounds ifFalse: [ + self updateWindowBounds. + self updatePageVisibility]] - self updateWindowBounds]] ifFalse: [ - oldWidth := self width. self width: self world width. + self center: self world center].! - self center: self world center. - self width = oldWidth ifFalse: [ - self updateWindowBounds]].! Item was added: + ----- Method: PreferenceWizardMorph>>updatePageVisibility (in category 'layout') ----- + updatePageVisibility + "Hide extra labels if page has not enough space." + + | currentPage scrollPane enoughRoom topText bottomText firstItem | + controlMorph ifNil: [^ self]. + controlMorph submorphs size > 1 ifFalse: [^ self]. + currentPage := controlMorph lastSubmorph. + scrollPane := currentPage submorphs second. + + topText := controlMorph firstSubmorph. + bottomText := currentPage lastSubmorph isTextMorph + ifTrue: [currentPage lastSubmorph]. + firstItem := scrollPane scroller firstSubmorph firstSubmorph. "checkbox" + + enoughRoom := topText visible + ifTrue: [firstItem height <= scrollPane height] + ifFalse: [firstItem height <= (scrollPane height + - topText height - (bottomText ifNil: [0] ifNotNil: [:t | t height]))]. + + enoughRoom not + ifTrue: [ + controlMorph firstSubmorph + visible: false; + disableLayout: true. + currentPage lastSubmorph isTextMorph + ifTrue: [ + currentPage lastSubmorph + visible: false; + disableLayout: true]] + ifFalse: [ + controlMorph firstSubmorph + visible: true; + disableLayout: false. + currentPage lastSubmorph isTextMorph + ifTrue: [ + currentPage lastSubmorph + visible: true; + disableLayout: false]]!

1 0

The Trunk: Monticello-eem.763.mcz
by commits＠source.squeak.org 30 Dec '21

30 Dec '21

Eliot Miranda uploaded a new version of Monticello to project The Trunk: http://source.squeak.org/trunk/Monticello-eem.763.mcz ==================== Summary ==================== Name: Monticello-eem.763 Author: eem Time: 30 December 2021, 12:02:50.794873 pm UUID: 05d83387-607f-405a-b895-891651a739a1 Ancestors: Monticello-mt.762 MCPatchOperation's subclasses implementations of #= prevent comparison with arbitr5ary objects. Add Object>>isMCPatchOperation and use it in the #= implementations. Sp now one can do e.g. SequenceableCollection allSubInstances select: [:s| s isCompiledCode not and: [(s indexOfSubCollection: #(2 2 2 2 3 2 2 1 1 1 2 3 3 3 3 4)) > 0]] without error. =============== Diff against Monticello-mt.762 =============== Item was changed: ----- Method: MCAddition>>= (in category 'comparing') ----- = other + ^other isMCPatchOperation + and: [other isAddition + and: [definition = other definition]]! - ^ other isAddition and: [definition = other definition]! Item was changed: ----- Method: MCModification>>= (in category 'comparing') ----- = other + ^other isMCPatchOperation + and: [other isModification + and: [obsoletion = other obsoletion + and: [modification = other modification]]]! - ^ other isModification - and: [obsoletion = other obsoletion - and: [modification = other modification]]! Item was added: + ----- Method: MCPatchOperation>>isMCPatchOperation (in category 'testing') ----- + isMCPatchOperation + ^true! Item was changed: ----- Method: MCRemoval>>= (in category 'comparing') ----- = other + ^other isMCPatchOperation + and: [other isRemoval + and: [definition = other definition]]! - ^ other isRemoval and: [definition = other definition]! Item was added: + ----- Method: Object>>isMCPatchOperation (in category '*Monticello-Patching-testing') ----- + isMCPatchOperation + ^false!

1 0

The Trunk: System-mt.1274.mcz
by commits＠source.squeak.org 30 Dec '21

30 Dec '21

Marcel Taeumel uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-mt.1274.mcz ==================== Summary ==================== Name: System-mt.1274 Author: mt Time: 30 December 2021, 5:43:11.303026 pm UUID: 05fbd735-bfd5-f74c-9205-2d7835c12f88 Ancestors: System-mt.1273 Fixes a minor glitch with themes not applying correctly when using scale factors with pre-rendered fonts (i.e., 100%, 125%, 150%). =============== Diff against System-mt.1273 =============== Item was changed: ----- Method: UserInterfaceTheme>>setScaleFactor: (in category 'private - display scale') ----- setScaleFactor: aFloat "Private. Use #applyScaled:. In the receiver, change the fonts to have a scale of aFloat. Change all fonts to be TrueType fonts if no pre-rendered fonts exist. Never change the 100% reference theme but make a copy. Apply the receiver to the system." (self isTTCBased not and: [aFloat = self localScaleFactor]) + ifTrue: [self apply. ^ self]. - ifTrue: [self isCurrent ifFalse: [self apply]. ^ self]. (self isTTCBased not and: [self localScaleFactor = 1.0]) "!!!! Never change the reference theme !!!!" ifTrue: [^ self lookupSimilar ifNil: [self copyWithScaleFactor: aFloat] ifNotNil: [:other | other setScaleFactorPreApply: aFloat]]. aFloat = 1.0 ifTrue: [^ self doScale100]. aFloat = 1.25 ifTrue: [^ self doScale125]. aFloat = 1.5 ifTrue: [^ self doScale150]. "And now transition from the pre-rendered world into the TrueType world. Or re-use an existing TrueType-based theme with new values. See #lookupSimilar above." TextStyle pixelsPerInch: 96.0 * RealEstateAgent scaleFactor "current, based on pixels". self makeTTCBased. self applyAfter: [TextStyle pixelsPerInch: 96.0 * aFloat "new, not rounded"].!

1 0

The Trunk: Tools-mt.1098.mcz
by commits＠source.squeak.org 30 Dec '21

30 Dec '21

Marcel Taeumel uploaded a new version of Tools to project The Trunk: http://source.squeak.org/trunk/Tools-mt.1098.mcz ==================== Summary ==================== Name: Tools-mt.1098 Author: mt Time: 30 December 2021, 4:44:52.740234 pm UUID: 36e75407-9274-574b-b4e8-a0920a4eda64 Ancestors: Tools-mt.1097 Fixes typo in postscript. Sorry for the noise. Update stream should work again. =============== Diff against Tools-mt.1097 =============== Item was changed: + (PackageInfo named: 'Tools') postscript: 'ToolIcons icons removeKey: #font ifAbsent: [].'! - (PackageInfo named: 'Tools') postscript: 'ToolIcons icons removeKey: #font.'!

1 0

The Trunk: Monticello-mt.762.mcz
by commits＠source.squeak.org 30 Dec '21

30 Dec '21

Marcel Taeumel uploaded a new version of Monticello to project The Trunk: http://source.squeak.org/trunk/Monticello-mt.762.mcz ==================== Summary ==================== Name: Monticello-mt.762 Author: mt Time: 30 December 2021, 4:35:07.485234 pm UUID: 2a1ee58e-ee0e-2c49-bd17-c45b397b3e1a Ancestors: Monticello-mt.761 I meant too well. Reduce the window for MCVersionInspector again by 50px. =============== Diff against Monticello-mt.761 =============== Item was changed: ----- Method: MCVersionInspector>>defaultExtent (in category 'morphic ui') ----- defaultExtent + ^ 450@200! - ^ 500@200!

1 0

The Trunk: Tools-mt.1097.mcz
by commits＠source.squeak.org 30 Dec '21

30 Dec '21

Marcel Taeumel uploaded a new version of Tools to project The Trunk: http://source.squeak.org/trunk/Tools-mt.1097.mcz ==================== Summary ==================== Name: Tools-mt.1097 Author: mt Time: 30 December 2021, 4:27:28.684748 pm UUID: d7b0b113-d24a-974f-8733-e9a19feb2cfc Ancestors: Tools-mt.1096 Complements Graphics-mt.455 =============== Diff against Tools-mt.1096 =============== Item was changed: ----- Method: ToolIcons class>>font (in category 'private') ----- font | icon f1 f2 | + icon := Form extent: 16@16 depth: 32. - icon := Form extent: 12@12 depth: 32. f1 := StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 7.5. f2 := StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 10.5. icon getCanvas + drawString: 'A' at: 0@ (15 - f1 height) font: f1 color: Color black; + drawString: 'A' at: (f1 widthOf: $A) @ (15 - f2 height) font: f2 color: Color black. - drawString: 'A' at: 0@ (12 - f1 height) font: f1 color: Color black; - drawString: 'A' at: (f1 widthOf: $A) @ (12 - f2 height) font: f2 color: Color black. ^ icon! Item was changed: + (PackageInfo named: 'Tools') postscript: 'ToolIcons icons removeKey: #font.'! - (PackageInfo named: 'Tools') postscript: 'Workspace allInstances do: [:workspace | - (workspace instVarNamed: #bindings) - removeKey: #''_fileDirectory'' ifAbsent: nil; - removeKey: #''_windowTitle'' ifAbsent: nil; - removeKey: #''_fileLineConversion'' ifAbsent: nil]. - - ProcessBrowser registerWellKnownProcesses. "Tools-eem.1016"'!

1 0

The Trunk: ST80-mt.274.mcz
by commits＠source.squeak.org 30 Dec '21

30 Dec '21

Marcel Taeumel uploaded a new version of ST80 to project The Trunk: http://source.squeak.org/trunk/ST80-mt.274.mcz ==================== Summary ==================== Name: ST80-mt.274 Author: mt Time: 30 December 2021, 4:26:56.874748 pm UUID: 65cb7397-5a05-9c4a-bdfb-7f702dc3c931 Ancestors: ST80-mt.273 Complements Graphics-mt.455 =============== Diff against ST80-mt.273 =============== Item was changed: ----- Method: Controller>>interActivityPause (in category 'basic control sequence') ----- interActivityPause "if we are looping quickly, insert a short delay. Thus if we are just doing UI stuff, we won't take up much CPU" | currentTime wait | MinActivityLapse ifNotNil: [ lastActivityTime ifNotNil: [ currentTime := Time millisecondClockValue. wait := lastActivityTime + MinActivityLapse - currentTime. wait > 0 ifTrue: [ wait <= MinActivityLapse "big waits happen after a snapshot" + ifTrue: [DisplayScreen checkForNewScreenScaleFactor; checkForNewScreenSize. - ifTrue: [DisplayScreen checkForNewScreenSize. (Delay forMilliseconds: wait) wait ]. ]. ]. ]. lastActivityTime := Time millisecondClockValue.!

1 0

The Trunk: PreferenceBrowser-mt.123.mcz
by commits＠source.squeak.org 30 Dec '21

30 Dec '21

Marcel Taeumel uploaded a new version of PreferenceBrowser to project The Trunk: http://source.squeak.org/trunk/PreferenceBrowser-mt.123.mcz ==================== Summary ==================== Name: PreferenceBrowser-mt.123 Author: mt Time: 30 December 2021, 4:26:23.253748 pm UUID: 480d1495-ecbb-f545-9811-4010e2b67eb8 Ancestors: PreferenceBrowser-mt.122 Complements Graphics-mt.455 The preference wizard now begins with asking the user about the preferred scale factor. =============== Diff against PreferenceBrowser-mt.122 =============== Item was changed: Morph subclass: #PreferenceWizardMorph + instanceVariableNames: 'previewWorld titleMorph buttonRowMorph controlMorph startButton previousButton nextButton doneButton pages currentPageIndex pagesLabel skipButton isFullScreen lowPerformanceMorph checkmark radiomark' - instanceVariableNames: 'previewWorld titleMorph buttonRowMorph controlMorph startButton previousButton nextButton pages currentPageIndex pagesLabel skipButton isFullScreen lowPerformanceMorph checkmark' classVariableNames: '' poolDictionaries: '' category: 'PreferenceBrowser'! Item was added: + ----- Method: PreferenceWizardMorph>>changedRadio (in category 'updating') ----- + changedRadio + + self dependents + select: [:dep | dep respondsTo: #getLabelSelector] + thenDo: [:button | + button update: button getStateSelector. + button update: button getLabelSelector].! Item was changed: ----- Method: PreferenceWizardMorph>>checkmark (in category 'initialization') ----- checkmark + ^ checkmark ifNil: [checkmark := (((ToolIcons iconNamed: #checkmark) dyed: Color white) scaledToSize: (TextStyle defaultFont height * 1.25) asPoint) asMorph]! - ^ checkmark ifNil: [checkmark := (((ToolIcons iconNamed: #checkmark) dyed: Color white) scaledToSize: 20@20) asMorph]! Item was added: + ----- Method: PreferenceWizardMorph>>chooseScaleFactor: (in category 'actions - radio') ----- + chooseScaleFactor: inPercent + + Display relativeUiScaleFactor: inPercent / 100. + self changedRadio. + Project current world + noDisplayDuring: [self updateFromChangedScaleFactor].! Item was changed: + ----- Method: PreferenceWizardMorph>>chooseTheme: (in category 'actions - radio') ----- - ----- Method: PreferenceWizardMorph>>chooseTheme: (in category 'support') ----- chooseTheme: aTheme + aTheme applyScaled. - aTheme apply. "The theme does not theme this fake world." + previewWorld fillStyle: self world fillStyle. + + self changedRadio.! - previewWorld fillStyle: self world fillStyle.! Item was changed: ----- Method: PreferenceWizardMorph>>createButton (in category 'initialization - building') ----- createButton ^ PluggableButtonMorphPlus new setProperty: #noUserInterfaceTheme toValue: true; offColor: (self defaultColor adjustBrightness: 0.2); feedbackColor: (self defaultColor adjustBrightness: 0.4); model: self; + font: (UserInterfaceTheme current get: #wizardButtonFont); - font: (StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 12); textColor: self defaultTextColor; borderColor: self defaultTextColor; instVarNamed: #borderColor put: self defaultTextColor; "HACK!!" + borderWidth: (2 * RealEstateAgent scaleFactor) truncated; - borderWidth: 2; cornerStyle: (self hasLowPerformance ifTrue: [#square] ifFalse: [#rounded]); vResizing: #shrinkWrap; hResizing: #shrinkWrap; + layoutInset: self defaultButtonMargins; - layoutInset: (20@10 corner: 20@10); yourself! Item was changed: ----- Method: PreferenceWizardMorph>>createCheckbox:for:help: (in category 'initialization - building') ----- createCheckbox: label for: selector help: terms | box lbl btn | btn := self createButton layoutInset: 0; label: ' '; onColor: (self defaultColor adjustBrightness: 0.3) offColor: (self defaultColor adjustBrightness: 0.3); vResizing: #rigid; hResizing: #rigid; action: ('toggle', selector) asSymbol; getStateSelector: ('state', selector) asSymbol; getLabelSelector: ('label', selector) asSymbol; + extent: (TextStyle defaultFont height * 1.75) asPoint. - extent: 25@25. lbl := self createLabel: label color: self defaultTextColor. lbl hResizing: #spaceFill. box := Morph new + setProperty: #isCheckbox toValue: true; color: Color transparent; changeTableLayout; listDirection: #leftToRight; cellPositioning: #topLeft; hResizing: #spaceFill; vResizing: #shrinkWrap; rubberBandCells: true; + cellGap: (TextStyle defaultFont widthOf: $x); - cellGap: 10; yourself. box addAllMorphs: {btn. lbl}. self setBalloonText: (terms isString ifTrue: [terms] ifFalse: [self findHelpStringFor: terms]) for: box. ^ box! Item was changed: ----- Method: PreferenceWizardMorph>>createLabel: (in category 'initialization - building') ----- createLabel: aString + ^ self createLabel: aString color: (self defaultTextColor adjustBrightness: -0.15)! - ^ self createLabel: aString color: (self defaultTextColor adjustBrightness: -0.1)! Item was changed: ----- Method: PreferenceWizardMorph>>createLabel:color: (in category 'initialization - building') ----- createLabel: aString color: aColor + | lbl | + lbl := TextMorph new hResizing: #spaceFill; vResizing: #shrinkWrap. + lbl newContents:aString. + lbl text + addAttribute: (TextColor color: aColor); + addAttribute: (TextFontReference toFont: ((UserInterfaceTheme current get: #wizardStandardFont))). + lbl margins: self defaultTextMargins. + lbl lock. + ^ lbl! - ^ self createLabel: aString color: aColor pointSize: 12! Item was removed: - ----- Method: PreferenceWizardMorph>>createLabel:color:pointSize: (in category 'initialization - building') ----- - createLabel: aString color: aColor pointSize: size - - | lbl | - lbl := TextMorph new hResizing: #spaceFill; vResizing: #shrinkWrap. - lbl newContents:aString. - lbl text - addAttribute: (TextColor color: aColor); - addAttribute: (TextFontReference toFont: ((StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: size))). - lbl lock. - ^ lbl! Item was changed: ----- Method: PreferenceWizardMorph>>createPage (in category 'initialization - building') ----- createPage ^ Morph new color: Color transparent; hResizing: #spaceFill; vResizing: #spaceFill; changeTableLayout; listDirection: #topToBottom; cellPositioning: #topLeft; + layoutInset: (self layoutInset asPoint corner: self cellGap@0); + cellGap: self cellGap; - layoutInset: (20@20 corner: 10@0); - cellGap: 10; yourself! Item was added: + ----- Method: PreferenceWizardMorph>>createRadioButton:for:argument: (in category 'initialization - building') ----- + createRadioButton: label for: selector argument: object + + ^ self createRadioButton: label for: selector argument: object help: #()! Item was added: + ----- Method: PreferenceWizardMorph>>createRadioButton:for:argument:help: (in category 'initialization - building') ----- + createRadioButton: label for: selector argument: object help: terms + + | box lbl btn suffix | + suffix := ((object respondsTo: #name) + ifTrue: [object name] + ifFalse: [object asString]) asLegalSelector. + + btn := self createButton + layoutInset: 0; + label: ' '; + onColor: (self defaultColor adjustBrightness: 0.3) offColor: (self defaultColor adjustBrightness: 0.3); + vResizing: #rigid; + hResizing: #rigid; + actionSelector: ('choose', selector, ':') asSymbol; + arguments: {object}; + getStateSelector: ('state', selector, suffix) asSymbol; + getLabelSelector: ('radio', selector, suffix) asSymbol; + extent: (TextStyle defaultFont height * 1.75) asPoint. + + lbl := self createLabel: label color: self defaultTextColor. + lbl hResizing: #spaceFill. + + box := Morph new + setProperty: #isRadioButton toValue: true; + color: Color transparent; + changeTableLayout; + listDirection: #leftToRight; + cellPositioning: #topLeft; + hResizing: #spaceFill; + vResizing: #shrinkWrap; + rubberBandCells: true; + cellGap: (TextStyle defaultFont widthOf: $x); + yourself. + + box addAllMorphs: {btn. lbl}. + self + setBalloonText: (terms isString ifTrue: [terms] ifFalse: [self findHelpStringFor: terms]) + for: box. + ^ box! Item was changed: ----- Method: PreferenceWizardMorph>>createScrollPane (in category 'initialization - building') ----- createScrollPane | pane | pane := ScrollPane new setProperty: #noUserInterfaceTheme toValue: true; hScrollBarPolicy: #never; vScrollBarPolicy: #whenNeeded; borderWidth: 0; color: Color transparent; + scrollBarThickness: self layoutInset; - scrollBarThickness: 20; yourself. pane hResizing: #spaceFill; vResizing: #spaceFill. pane scroller changeTableLayout. pane scroller addMorph: (Morph new changeTableLayout; color: Color transparent; hResizing: #spaceFill; vResizing: #shrinkWrap; + cellGap: self cellGap; + layoutInset: (0@0 corner: self cellGap@0); - cellGap: 10; - layoutInset: (0@0 corner: 10@0); yourself). pane vScrollBar setProperty: #noUserInterfaceTheme toValue: true; sliderColor: Color white. (pane vScrollBar instVarNamed: #slider) cornerStyle: (self hasLowPerformance ifTrue: [#square] ifFalse: [#rounded]); + borderWidth: (2 * RealEstateAgent scaleFactor) truncated. - borderWidth: 2. (pane vScrollBar instVarNamed: #pagingArea) cornerStyle: (self hasLowPerformance ifTrue: [#square] ifFalse: [#rounded]). ^ pane! Item was added: + ----- Method: PreferenceWizardMorph>>defaultButtonMargins (in category 'initialization') ----- + defaultButtonMargins + + | w h | + w := (self defaultFont widthOf: $x) * 2. + h := self defaultFont height // 2. + ^ w@h corner: w@h! Item was added: + ----- Method: PreferenceWizardMorph>>defaultExtent (in category 'initialization') ----- + defaultExtent + + ^ 1024@768! Item was added: + ----- Method: PreferenceWizardMorph>>defaultFont (in category 'initialization') ----- + defaultFont + + ^ UserInterfaceTheme current get: #wizardStandardFont! Item was added: + ----- Method: PreferenceWizardMorph>>defaultTextMargins (in category 'initialization') ----- + defaultTextMargins + + | w h | + w := self defaultFont widthOf: $x. + h := self defaultFont height. + ^ 0@(h//8) corner: w@(h//4)! Item was changed: ----- Method: PreferenceWizardMorph>>doesNotUnderstand: (in category 'actions - buttons') ----- doesNotUnderstand: msg (msg selector numArgs = 0 and: [msg selector beginsWith: 'label']) ifTrue: [^ (self perform: ('state', (msg selector allButFirst: 5)) asSymbol) ifTrue: [self checkmark] ifFalse: [' '] ]. + + (msg selector numArgs = 0 and: [msg selector beginsWith: 'radio']) + ifTrue: [^ (self perform: ('state', (msg selector allButFirst: 5)) asSymbol) + ifTrue: [self radiomark] + ifFalse: [' '] ]. + + (msg selector numArgs = 0 and: [msg selector beginsWith: 'stateTheme']) + ifTrue: [^ self stateTheme: (msg selector allButFirst: 10)]. + + (msg selector numArgs = 0 and: [msg selector beginsWith: 'stateScaleFactor']) + ifTrue: [^ self stateScaleFactor: (msg selector allButFirst: 16)]. ^ super doesNotUnderstand: msg! Item was changed: ----- Method: PreferenceWizardMorph>>initialize (in category 'initialization') ----- initialize super initialize. isFullScreen := false. self hasLowPerformance ifTrue: [self color: self defaultColor] ifFalse: [self color: (self defaultColor alpha: 0.75)]. self setProperty: #indicateKeyboardFocus toValue: #never. self changeProportionalLayout; + layoutInset: (self defaultFont widthOf: $x) * 2; + cellGap: (self defaultFont widthOf: $x); - layoutInset: 20; - cellGap: 10; cellPositioning: #center; disableLayout: true; morphicLayerNumber: self class dialogLayer + 1. self addKeyboardCaptureFilter: self.! Item was changed: ----- Method: PreferenceWizardMorph>>initializeButtons (in category 'initialization - playfield') ----- initializeButtons buttonRowMorph := Morph new color: Color transparent; changeTableLayout; listDirection: #leftToRight; + cellGap: self cellGap; + layoutInset: (0@self layoutInset corner: 0@0); - cellGap: 10; - layoutInset: (0@20 corner: 0@0); vResizing: #shrinkWrap; hResizing: #spaceFill; yourself. buttonRowMorph addAllMorphs: { previousButton := self createButton action: #previous; label: 'Previous' translated. + pagesLabel := (self createLabel: '0 / 0') hResizing: #shrinkWrap; margins: (self layoutInset@0 corner: self layoutInset@0); fullBounds; yourself. - pagesLabel := (self createLabel: '0 / 0') hResizing: #shrinkWrap; margins: (20@0 corner: 20@0); fullBounds; yourself. nextButton := self createButton action: #next; label: 'Next' translated. self createHorizontalSpacer. + doneButton := self createButton action: #accept; label: 'Done' translated}. - self createButton action: #accept; label: 'Done' translated}. + (previousButton width max: nextButton width) in: [:w | + previousButton hResizing: #rigid; width: w. + nextButton hResizing: #rigid; width: w]. + buttonRowMorph fullBounds. buttonRowMorph layoutFrame: (LayoutFrame fractions: (0 @ 1 corner: 1 @ 1) offsets: (0@ buttonRowMorph height negated corner: 0 @ 0)).! Item was changed: ----- Method: PreferenceWizardMorph>>initializeControlMorph (in category 'initialization - playfield') ----- initializeControlMorph controlMorph := Morph new color: Color transparent; changeTableLayout; listDirection: #topToBottom; hResizing: #spaceFill; vResizing: #spaceFill; + layoutInset: (0@0 corner: self cellGap@0); + layoutFrame: (LayoutFrame fractions: (0.0 @ 0 corner: 0.35 @ 1.0) offsets: (0@ titleMorph height corner: 0 @ buttonRowMorph height negated)); - layoutInset: (0@0 corner: 10@0); - layoutFrame: (LayoutFrame fractions: (0.0 @ 0 corner: 0.3 @ 1.0) offsets: (0@ titleMorph height corner: 0 @ buttonRowMorph height negated)); yourself. controlMorph addMorph: (self createLabel: 'Please take a few minutes and configure the look-and-feel of the environment. You can always adjust these settings later. You can see the effects of these settings in the live and editable windows to the right.' translated).! Item was added: + ----- Method: PreferenceWizardMorph>>initializePage00ScaleFactor (in category 'initialization - pages') ----- + initializePage00ScaleFactor + + | currentPage pane helper | + currentPage := pages add: self createPage. + pane := self createScrollPane. + + currentPage addMorphBack: (self createLabel: 'Choose a scale factor' translated color: Color white). + currentPage addMorphBack: pane. + + helper := MenuMorph new. + TheWorldMainDockingBar instance scaleFactorsOn: helper. + + helper items allButLast do: [:item | + pane scroller firstSubmorph addMorphBack: (self + createRadioButton: item contents + for: #ScaleFactor + argument: item arguments first * 100)]. + + Display platformScaleFactorKnown ifFalse: [ + currentPage addMorphBack: (self createLabel: 'Note that the recommended scale factor for your platform and display is unknown. Please adjust manually.' translated color: Color banana)].! Item was changed: ----- Method: PreferenceWizardMorph>>initializePage01Themes (in category 'initialization - pages') ----- initializePage01Themes | currentPage pane | currentPage := pages add: self createPage. pane := self createScrollPane. + currentPage addMorphBack: (self createLabel: 'Choose a theme' color: Color white). - currentPage addMorphBack: (self createLabel: 'Choose a theme:' color: Color white). currentPage addMorphBack: pane. ((UserInterfaceTheme allThemes + select: [:uit | uit isGenuine]) - reject: [:uit | uit name beginsWith: 'Demo']) sorted: [:a :b | a name <= b name]) do: [:ea | + pane scroller firstSubmorph addMorphBack: (self + createRadioButton: ea name + for: #Theme + argument: ea)]. - pane scroller firstSubmorph addMorphBack: (self createButton - label: ea name; - hResizing: #spaceFill; - action: #chooseTheme:; - arguments: {ea})]. + currentPage addMorphBack: (self createLabel: 'Note that "Colorful windows" show colors that fit the current theme. See next page.' translated color: Color banana)! - ! Item was removed: - ----- Method: PreferenceWizardMorph>>initializePage02bVisualsMore (in category 'initialization - pages') ----- - initializePage02bVisualsMore - - | currentPage pane | - currentPage := pages add: self createPage. - pane := self createScrollPane. - - currentPage addMorphBack: (self createLabel: 'Choose more visual settings' color: Color white). - currentPage addMorphBack: pane. - - pane scroller firstSubmorph addAllMorphsBack: { - self createCheckbox: 'Bigger Fonts' translated for: #UseBiggerFonts help: 'For high-DPI displays, bigger fonts can improve readability.'. - self createCheckbox: 'Bigger Cursors' translated for: #UseBiggerCursors help: #(bigger cursor). - }.! Item was changed: ----- Method: PreferenceWizardMorph>>initializePage99ExtraPackages (in category 'initialization - pages') ----- initializePage99ExtraPackages "Let the user install extra packages." | currentPage packagesList installButton | currentPage := self createPage. currentPage cellPositioning: #topCenter; - layoutInset: (150@40 corner: 150@20); addMorphBack: self createHorizontalSpacer; addMorphBack: ((self createLabel: 'Do you want to install extra packages?' color: Color white) hResizing: #shrinkWrap; yourself); + addMorphBack: ((self createLabel: 'Note that the installation process requires a network connection with Internet access and might take several minutes.' color: (Color gray: 0.9)) - addMorphBack: ((self createLabel: 'Note that the installation process requires an internet connection and may take several minutes.' color: (Color gray: 0.9)) hResizing: #rigid; vResizing: #shrinkWrap; + width: (self defaultFont widthOf: $x) * 55; - width: 450; yourself). currentPage submorphs last text addAttribute: TextAlignment centered. currentPage submorphs last layoutChanged. + currentPage addMorphBack: (self createVerticalSpace height: self layoutInset). - currentPage addMorphBack: (self createVerticalSpace height: 20). packagesList := self createScrollPane. packagesList + width: (self defaultFont widthOf: $x) * 40; - width: 350; hResizing: #rigid; vResizing: #spaceFill. packagesList scroller firstSubmorph addAllMorphsBack: { self createCheckbox: 'Latest system updates' translated for: #InstallLatestUpdates help: 'Install the latest patches for ' translated, SystemVersion current version. self createCheckbox: 'Refactoring support in code browsers' translated for: #InstallRefactoringTools help: 'Refactoring is a process of re-writing or re-organizing text or code. The purpose of a refactor is to make the code or text more understandable and readable while exactly preserving its meaning and behavior.' translated. self createCheckbox: 'Autocomplete in code editors' translated for: #InstallAutoComplete help: 'Package that provides interactive, context-sensitive auto-completion for Squeak.' translated. self createCheckbox: 'Git support and browser' translated for: #InstallGitInfrastructure help: 'From the Git Browser, you can create new commits, synchronize with remote repositories (fetch, pull, push), manage and merge branches, switch between them, and compare different versions.' translated. self createCheckbox: 'Foreign function interface (FFI)' translated for: #InstallFFI help: 'FFI, the Squeak Foreign Function Interface, is used to call functions located in shared libraries that are not part of the Squeak VM nor its plugins' translated. self createCheckbox: 'Access OS functions' translated for: #InstallOSProcess help: 'OSProcess provides access to operating system functions, including pipes and child process creation.' translated. }. currentPage addMorphBack: packagesList. currentPage addMorphBack: ((self createLabel: 'Find more on www.squeak.org/projects' color: (Color gray: 0.9)) hResizing: #shrinkWrap; yourself). installButton := (self createButton action: #installExtraPackages). currentPage addMorphBack: installButton. currentPage addMorphBack: (self createButton action: #showSqueak; label: 'No, maybe later.' translated). self setProperty: #checkInternet toValue: true. self checkInternetOn: installButton. ^ currentPage! Item was changed: ----- Method: PreferenceWizardMorph>>initializePages (in category 'initialization - playfield') ----- initializePages pages := OrderedCollection new. currentPageIndex := 0. self + initializePage00ScaleFactor; initializePage01Themes; initializePage02Visuals; - initializePage02bVisualsMore; initializePage03Interaction; initializePage04InteractionMore; initializePage05Tools.! Item was changed: ----- Method: PreferenceWizardMorph>>initializePreviewWorld (in category 'initialization - playfield') ----- initializePreviewWorld Preferences enable: #systemWindowEmbedOK. previewWorld := PasteUpMorph new hResizing: #spaceFill; vResizing: #spaceFill; viewBox: (0@0 corner: 500@500); + layoutFrame: (LayoutFrame fractions: (0.35 @ 0 corner: 1.0 @ 1.0) offsets: (0@ titleMorph height corner: 0 @ buttonRowMorph height negated)); - layoutFrame: (LayoutFrame fractions: (0.3 @ 0 corner: 1.0 @ 1.0) offsets: (0@ titleMorph height corner: 0 @ buttonRowMorph height negated)); fillStyle: Project current world fillStyle; + borderWidth: (2 * RealEstateAgent scaleFactor) truncated; - borderWidth: 2; borderColor: Color white; cornerStyle: (self hasLowPerformance ifTrue: [#square] ifFalse: [#rounded]); yourself. self addOrReplaceBrowser; addOrReplaceSenders; addOrReplaceWorkspace; updateWindowBounds.! Item was changed: ----- Method: PreferenceWizardMorph>>initializeWelcome (in category 'initialization') ----- initializeWelcome titleMorph := ('Welcome to Squeak' translated asText addAttribute: (TextColor color: self defaultTextColor); + addAttribute: (TextFontReference toFont: (UserInterfaceTheme current get: #wizardTitleFont)); - addAttribute: (TextFontReference toFont: (StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 20)); yourself) asMorph lock. + titleMorph margins: (self cellGap @ 0 corner: self cellGap @ self cellGap). - titleMorph margins: (10@0 corner: 10@10). titleMorph layoutFrame: (LayoutFrame fractions: (0 @ 0 corner: 1 @ 0) offsets: (0@ 0 corner: 0 @ titleMorph height)). startButton := (self createButton action: #showPlayfield; label: 'Configure' translated). skipButton := (self createButton action: #showSqueak; label: 'Skip' translated). (startButton width max: skipButton width) in: [:w | startButton hResizing: #rigid; width: w. skipButton hResizing: #rigid; width: w. startButton layoutFrame: (LayoutFrame fractions: (0.5 @ 0.6 corner: 0.5 @ 0.6) offsets: (2*w negated @ 0 corner: 0 @ 0)). skipButton layoutFrame: (LayoutFrame fractions: (0.5 @ 0.6 corner: 0.5 @ 0.6) offsets: (0@ 0 corner: 2*w @ 0))]. lowPerformanceMorph := TextMorph new lock. self addAllMorphs: {titleMorph. startButton. skipButton. lowPerformanceMorph}.! Item was added: + ----- Method: PreferenceWizardMorph>>radiomark (in category 'initialization') ----- + radiomark + + ^ radiomark ifNil: [radiomark := Morph new color: Color white; extent: (TextStyle defaultFont height * 0.8) asPoint]! Item was changed: ----- Method: PreferenceWizardMorph>>setBalloonText:for: (in category 'support') ----- setBalloonText: string for: morph + string ifEmpty: [^morph balloonText: nil]. + morph balloonColor: ((self defaultColor alpha: self color alpha) adjustBrightness: 0.2); balloonText: (string asText + addAttribute: (TextFontReference toFont: (UserInterfaceTheme current get: #wizardHelpFont)); - addAttribute: (TextFontReference toFont: (StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 9)); addAttribute: (TextColor color: Color banana)).! Item was changed: ----- Method: PreferenceWizardMorph>>showPlayfield (in category 'actions') ----- showPlayfield previewWorld ifNil: [self initializePlayfield]. startButton hide. skipButton hide. lowPerformanceMorph hide. isFullScreen := true. self step. titleMorph layoutFrame: (LayoutFrame fractions: (0 @ 0 corner: 1 @ 0) offsets: (0@ 0 corner: 0 @ titleMorph height)). self refreshWorld. - 500 milliSeconds wait. controlMorph show. previewWorld show. buttonRowMorph show. self next. self refreshWorld. ! Item was added: + ----- Method: PreferenceWizardMorph>>stateScaleFactor: (in category 'actions - radio') ----- + stateScaleFactor: key + + ^ (Display relativeUiScaleFactor * 100) rounded asString asLegalSelector = key! Item was added: + ----- Method: PreferenceWizardMorph>>stateTheme: (in category 'actions - radio') ----- + stateTheme: key + + ^ UserInterfaceTheme current name asLegalSelector = key! Item was removed: - ----- Method: PreferenceWizardMorph>>stateUseBiggerFonts (in category 'actions - buttons') ----- - stateUseBiggerFonts - - ^ UserInterfaceTheme current name beginsWith: 'Demo'! Item was changed: ----- Method: PreferenceWizardMorph>>toggleUseBiggerCursors (in category 'actions - buttons') ----- toggleUseBiggerCursors + Cursor useBiggerCursors: self stateUseBiggerCursors not. - Cursor useBiggerCursors: self stateUseBiggerCursors not. - Cursor currentCursor: Cursor currentCursor. - self changed: #stateUseBiggerCursors.! Item was removed: - ----- Method: PreferenceWizardMorph>>toggleUseBiggerFonts (in category 'actions - buttons') ----- - toggleUseBiggerFonts - - [ - self stateUseBiggerFonts - ifFalse: [Preferences setDemoFonts] - ifTrue: [Preferences restoreDefaultFonts]. - ] valueSupplyingAnswer: true. - - self changed: #stateUseBiggerFonts.! Item was added: + ----- Method: PreferenceWizardMorph>>updateFromChangedScaleFactor (in category 'display scale') ----- + updateFromChangedScaleFactor + + previewWorld delete. + previewWorld := nil. + DisplayScreen displayIsFullScreen ifFalse: [ + DisplayScreen setNewScreenSize: (self defaultExtent * RealEstateAgent scaleFactor) rounded]. + + checkmark := nil. + radiomark := nil. + + self + layoutInset: (self defaultFont widthOf: $x) * 2; + cellGap: (self defaultFont widthOf: $x). + + titleMorph + font: (UserInterfaceTheme current get: #wizardTitleFont); + margins: (self cellGap @ 0 corner: self cellGap @ self cellGap). + titleMorph layoutFrame + bottomOffset: titleMorph height. + + self updateLowPerformanceLabel: lowPerformanceMorph contents. + + "buttons" + {startButton. skipButton. previousButton. nextButton. doneButton}, + (pages gather: [:page | page allMorphs select: [:ea | ea isButton]]) + do: [:button | + ((button owner hasProperty: #isRadioButton) + or: [button owner hasProperty: #isCheckbox]) + ifTrue: [ + button + "layoutInset: 0;" + extent: (TextStyle defaultFont height * 1.75) asPoint; + update: button getLabelSelector. + button owner cellGap: (TextStyle defaultFont widthOf: $x)] + ifFalse: [ + button + layoutInset: self defaultButtonMargins]. + button + borderWidth: (2 * RealEstateAgent scaleFactor) truncated; + font: (UserInterfaceTheme current get: #wizardButtonFont); + updateMinimumExtent "Font might not change but PPI did."]. + + self fullBounds. + + (startButton minimumWidth max: skipButton minimumWidth) in: [:w | + startButton hResizing: #rigid; width: w. + skipButton hResizing: #rigid; width: w. + startButton layoutFrame leftOffset: 2*w negated. + skipButton layoutFrame rightOffset: 2*w]. + + (previousButton minimumWidth max: nextButton minimumWidth) in: [:w | + previousButton hResizing: #rigid; width: w. + nextButton hResizing: #rigid; width: w]. + pagesLabel + margins: (self layoutInset@0 corner: self layoutInset@0); + font: (UserInterfaceTheme current get: #wizardStandardFont). + buttonRowMorph + cellGap: self cellGap; + layoutInset: (0@self layoutInset corner: 0@0). + buttonRowMorph layoutFrame + topOffset: buttonRowMorph fullBounds height negated. + + "labels" + {controlMorph firstSubmorph}, (pages gather: [:page | page allMorphs select: [:ea | ea isTextMorph]]) + do: [:label | + label + font: (UserInterfaceTheme current get: #wizardStandardFont); + margins: self defaultTextMargins + "No need for #releaseParagraph because window resizing will happen anyway."]. + + "controlMorph" + controlMorph layoutInset: (0@0 corner: self cellGap@0). + controlMorph layoutFrame + topOffset: titleMorph height; + bottomOffset: buttonRowMorph height negated. + + "scroll panes in pages" + pages do: [:page | | scrollPane | + page + layoutInset: (self layoutInset asPoint corner: self cellGap@0); + cellGap: self cellGap. + scrollPane := page submorphs second. + scrollPane scrollBarThickness: self layoutInset. + scrollPane scroller firstSubmorph + cellGap: self cellGap; + layoutInset: (0@0 corner: self cellGap@0). + (scrollPane vScrollBar instVarNamed: #slider) + borderWidth: (2 * RealEstateAgent scaleFactor) truncated]. + + "previewWorld" + self initializePreviewWorld. + self addMorph: previewWorld. + self step. + " previewWorld borderWidth: (2 * RealEstateAgent scaleFactor) truncated. + previewWorld layoutFrame + topOffset: titleMorph height; + bottomOffset: buttonRowMorph height negated. + " ! Item was changed: ----- Method: PreferenceWizardMorph>>updateLowPerformanceLabel: (in category 'layout') ----- updateLowPerformanceLabel: string lowPerformanceMorph contentsAsIs: (string asText addAttribute: (TextColor color: (Color gray: 0.7)); + addAttribute: (TextFontReference toFont: (UserInterfaceTheme current get: #wizardHelpFont))). - addAttribute: (TextFontReference toFont: (StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 9))). + lowPerformanceMorph layoutFrame: (LayoutFrame fractions: (1 @ 1 corner: 1 @ 1) offsets: (lowPerformanceMorph fullBounds width negated @ lowPerformanceMorph fullBounds height negated corner: self layoutInset @ self layoutInset "Into margins")). - lowPerformanceMorph layoutFrame: (LayoutFrame fractions: (1 @ 1 corner: 1 @ 1) offsets: (lowPerformanceMorph fullBounds width negated @ lowPerformanceMorph fullBounds height negated corner: 20 @ 20 "Into margins")). self layoutChanged.! Item was changed: ----- Method: PreferenceWizardMorph>>updatePageLabel (in category 'layout') ----- updatePageLabel pagesLabel contentsAsIs: (('{1} / {2}' format: {currentPageIndex. pages size}) asText addAttribute: (TextColor color: (Color gray: 0.8)); + addAttribute: (TextFontReference toFont: (UserInterfaceTheme current get: #wizardStandardFont))).! - addAttribute: (TextFontReference toFont: (StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 12))).! Item was changed: ----- Method: PreferenceWizardMorph>>updateWindowBounds (in category 'layout') ----- updateWindowBounds + | area extentToUse pointsToUse | - | windows offset margin extentToUse pointsToUse | isFullScreen == false ifTrue: [^ self]. previewWorld ifNil: [^ self]. self fullBounds. + area := previewWorld layoutBounds insetBy: self layoutInset. + extentToUse := area extent * (0.8 @ 0.45). - margin := 20@20. - extentToUse := (previewWorld extent - (margin * 2)) // 3 * (1.8 @ 1.5). pointsToUse := { + area topLeft. + area rightCenter. + area bottomCenter}. - previewWorld center - (previewWorld extent // (5.5 @ 4.5)). - previewWorld center + (previewWorld width // 5.5 @ 0). - previewWorld center + (0 @ (previewWorld width // 5))}. + previewWorld submorphs reversed withIndexDo: [:window :i | + window - windows := previewWorld submorphs. - offset := 50@50. - - windows reversed withIndexDo: [:ea :i | - ea extent: extentToUse; + center: (pointsToUse atWrap: i); + bounds: (window bounds translatedToBeWithin: area)].! - center: (pointsToUse atWrap: i). - offset := offset + (50@50)].! Item was changed: ----- Method: PreferenceWizardProgressMorph>>createProgressBar (in category 'as yet unclassified') ----- createProgressBar ^ SystemProgressBarMorph new + extent: ((self defaultFont widthOf: $x) * 35) @ ((self defaultFont widthOf: $x) * 2); - extent: 500@20; color: Color transparent; barColor: Color white; borderColor: Color white; + borderWidth: (2 * RealEstateAgent scaleFactor) truncated; - borderWidth: 2; yourself ! Item was added: + ----- Method: PreferenceWizardProgressMorph>>defaultFont (in category 'as yet unclassified') ----- + defaultFont + + ^ UserInterfaceTheme current get: #wizardStandardFont! Item was changed: ----- Method: PreferenceWizardProgressMorph>>setDefaultParameters (in category 'as yet unclassified') ----- setDefaultParameters "change the receiver's appareance parameters" self color: Color transparent; borderWidth: 0; + font: self defaultFont; - font: (StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 12); textColor: Color white.!

1 0

The Trunk: System-mt.1273.mcz
by commits＠source.squeak.org 30 Dec '21

30 Dec '21

Marcel Taeumel uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-mt.1273.mcz ==================== Summary ==================== Name: System-mt.1273 Author: mt Time: 30 December 2021, 4:25:04.081748 pm UUID: 0ebc119d-96a6-7d40-93d5-92bf611c9f87 Ancestors: System-mt.1272 Complements Graphics-mt.455 All pointSizes for pre-rendered fonts are updated to match 96.0 pixels-per-inch. =============== Diff against System-mt.1272 =============== Item was changed: ----- Method: CommunityTheme class>>addDarkFonts: (in category 'instance creation') ----- addDarkFonts: aUserInterfaceTheme "Set-up fonts." aUserInterfaceTheme + set: #balloonHelpFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 7.5 emphasized: TextEmphasis italic emphasisCode]; + set: #standardButtonFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 7.5]; + set: #standardCodeFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 10.5]; + set: #standardFlapFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 7.5 emphasized: TextEmphasis bold emphasisCode]; + set: #haloLabelFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 10.5]; + set: #standardListFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 10.5]; + set: #standardMenuFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 10.5]; + set: #standardSystemFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 10.5]; + set: #windowTitleFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 10.5 emphasized: TextEmphasis bold emphasisCode]! - set: #balloonHelpFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 7 emphasized: TextEmphasis italic emphasisCode]; - set: #standardButtonFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 7]; - set: #standardCodeFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 9]; - set: #standardFlapFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 7 emphasized: TextEmphasis bold emphasisCode]; - set: #haloLabelFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 9]; - set: #standardListFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 9]; - set: #standardMenuFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 9]; - set: #standardSystemFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 9]; - set: #windowTitleFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 9 emphasized: TextEmphasis bold emphasisCode]! Item was changed: ----- Method: MonokaiTheme class>>addDarkFonts: (in category 'instance creation') ----- addDarkFonts: theme "Set-up fonts." theme + set: #balloonHelpFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 7.5]; + set: #standardButtonFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 7.5]; + set: #standardCodeFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 10.5]; + set: #standardFlapFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 7.5 emphasized: TextEmphasis bold emphasisCode]; + set: #haloLabelFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 10.5]; + set: #standardListFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 10.5]; + set: #standardMenuFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 10.5]; + set: #standardSystemFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 10.5]; + set: #windowTitleFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 10.5].! - set: #balloonHelpFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 7]; - set: #standardButtonFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 7]; - set: #standardCodeFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 9]; - set: #standardFlapFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 7 emphasized: TextEmphasis bold emphasisCode]; - set: #haloLabelFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 9]; - set: #standardListFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 9]; - set: #standardMenuFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 9]; - set: #standardSystemFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 9]; - set: #windowTitleFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 9].! Item was removed: - ----- Method: Preferences class>>changeFontSize: (in category 'prefs - fonts') ----- - changeFontSize: delta - | theme base fonts | - delta = 0 ifTrue: [self restoreDefaultFonts]. - (UserInterfaceTheme current name beginsWith: 'Demo') - ifFalse: [ - "Create DEMO version of current theme." - theme := UserInterfaceTheme named: 'Demo'. - theme merge: UserInterfaceTheme current overwrite: true. - theme apply]. - - base := (TextStyle defaultFont name beginsWith: 'Darkmap') - ifTrue: ['Darkmap DejaVu Sans'] ifFalse: ['Bitmap DejaVu Sans']. - - fonts := { - {#SystemFont. base}. - {#FixedFont. 'BitstreamVeraSansMono'}. - {#ListFont. base}. - {#FlapFont. base}. - {#EToysFont. base}. - {#PaintBoxButtonFont. base}. - {#MenuFont. base}. - {#WindowTitleFont. base, ' B'}. - {#BalloonHelpFont. base}. - {#CodeFont. base}. - {#ButtonFont. base}. - } collect: [:ary || newPtSize | - newPtSize := (self perform: ('standard', ary first) asSymbol) pointSize + delta. - {('set', ary first, 'To:') asSymbol. ary second. newPtSize} - ]. - self setDefaultFonts: fonts. - ! Item was changed: ----- Method: Preferences class>>decreaseFontSize (in category 'prefs - fonts') ----- decreaseFontSize + Display uiScaleFactor: Display uiScaleFactor - 0.25.! - self changeFontSize: -3. - ! Item was changed: ----- Method: Preferences class>>displaySizeChanged (in category 'updating - system') ----- displaySizeChanged + - self flag: #todo. self tinyDisplay ifTrue: [self enable: #scrollBarsNarrow] ifFalse: [self disable: #scrollBarsNarrow]. self tinyDisplay ifTrue:[self disable: #biggerHandles] + ifFalse:[self enable: #biggerHandles]. + UserInterfaceTheme current apply.! - ifFalse:[self enable: #biggerHandles]! Item was changed: ----- Method: Preferences class>>fontConfigurationMenu: (in category 'prefs - fonts') ----- fontConfigurationMenu: aMenu aMenu removeAllMorphs. + aMenu defaultTarget: self. + aMenu addTitle: 'Fonts' translated. - aMenu addTitle: 'Standard System Fonts' translated. aMenu addStayUpIcons. aMenu add: 'default text font...' translated action: #chooseSystemFont. aMenu lastItem font: Preferences standardSystemFont. aMenu balloonTextForLastItem: 'Choose the default font to be used for code and in workspaces, transcripts, etc.' translated. aMenu add: 'default fixed font...' translated action: #chooseFixedFont. aMenu lastItem font: Preferences standardFixedFont. aMenu balloonTextForLastItem: 'Choose the default font to be used for text that needs fixed width characters for layouting etc.' translated. + aMenu addLine. + + aMenu add: 'code font...' translated action: #chooseCodeFont. + aMenu lastItem font: Preferences standardCodeFont. + aMenu balloonTextForLastItem: 'Choose the font to be used in code panes.' translated. + aMenu add: 'list font...' translated action: #chooseListFont. aMenu lastItem font: Preferences standardListFont. aMenu balloonTextForLastItem: 'Choose the font to be used in list panes' translated. - - aMenu add: 'flaps font...' translated action: #chooseFlapsFont. - aMenu lastItem font: Preferences standardFlapFont. - aMenu balloonTextForLastItem: 'Choose the font to be used on textual flap tabs' translated. + aMenu add: 'menu font...' translated action: #chooseMenuFont. + aMenu lastItem font: Preferences standardMenuFont. + aMenu balloonTextForLastItem: 'Choose the font to be used in menus' translated. + + aMenu add: 'button font...' translated action: #chooseStandardButtonFont. + aMenu lastItem font: Preferences standardButtonFont. + aMenu balloonTextForLastItem: 'Choose the font to be used in buttons.' translated. + + aMenu add: 'balloon-help font...' translated action: #chooseBalloonHelpFont. + aMenu lastItem font: Preferences standardBalloonHelpFont. + aMenu balloonTextForLastItem: 'choose the font to be used when presenting balloon help.' translated. + + aMenu addLine. + + " aMenu add: 'eToys font...' translated action: #chooseEToysFont. - aMenu add: 'eToys font...' translated action: #chooseEToysFont. aMenu lastItem font: Preferences standardEToysFont. aMenu balloonTextForLastItem: 'Choose the font to be used on eToys environment' translated. aMenu add: 'eToys title font...' translated action: #chooseEToysTitleFont. aMenu lastItem font: Preferences standardEToysTitleFont. aMenu balloonTextForLastItem: 'Choose the font to be used in titles on eToys environment' translated. + " - - aMenu add: 'halo label font...' translated action: #chooseHaloLabelFont. - aMenu lastItem font: Preferences standardHaloLabelFont. - aMenu balloonTextForLastItem: 'Choose the font to be used on labels ih halo' translated. - - aMenu add: 'menu font...' translated action: #chooseMenuFont. - aMenu lastItem font: Preferences standardMenuFont. - aMenu balloonTextForLastItem: 'Choose the font to be used in menus' translated. - aMenu add: 'window-title font...' translated action: #chooseWindowTitleFont. aMenu lastItem font: Preferences windowTitleFont. aMenu balloonTextForLastItem: 'Choose the font to be used in window titles.' translated. + aMenu add: 'halo-label font...' translated action: #chooseHaloLabelFont. + aMenu lastItem font: Preferences standardHaloLabelFont. + aMenu balloonTextForLastItem: 'Choose the font to be used on labels ih halo' translated. - aMenu add: 'balloon-help font...' translated action: #chooseBalloonHelpFont. - aMenu lastItem font: Preferences standardBalloonHelpFont. - aMenu balloonTextForLastItem: 'choose the font to be used when presenting balloon help.' translated. - - aMenu add: 'code font...' translated action: #chooseCodeFont. - aMenu lastItem font: Preferences standardCodeFont. - aMenu balloonTextForLastItem: 'Choose the font to be used in code panes.' translated. + aMenu add: 'flaps font...' translated action: #chooseFlapsFont. + aMenu lastItem font: Preferences standardFlapFont. + aMenu balloonTextForLastItem: 'Choose the font to be used on textual flap tabs' translated. - aMenu add: 'button font...' translated action: #chooseStandardButtonFont. - aMenu lastItem font: Preferences standardButtonFont. - aMenu balloonTextForLastItem: 'Choose the font to be used in buttons.' translated. + aMenu addLine. + aMenu addItem: [:item | + item + contents: 'set scale factor' translated; + subMenuUpdater: TheWorldMainDockingBar instance + selector: #scaleFactorsOn:]. + aMenu add: 'decrease font size (-)' translated action: #decreaseFontSize. + aMenu balloonTextForLastItem: 'Decrease the current scale factor by 25% to make fonts look smaller' translated. + aMenu add: 'increase font size (+)' translated action: #increaseFontSize. + aMenu balloonTextForLastItem: 'Increase the current scale factor by 25% to make fonts look bigger' translated. - aMenu add: 'demo/hi-dpi mode' translated action: #setDemoFonts. - aMenu balloonTextForLastItem: 'Set Fonts usable for giving a presentation' translated. aMenu addLine. aMenu add: 'restore default font choices' translated action: #restoreDefaultFonts. aMenu balloonTextForLastItem: 'Use the standard system font defaults' translated. aMenu add: 'print current font choices' translated action: #printStandardSystemFonts. aMenu balloonTextForLastItem: 'Print the standard system font defaults to the Transcript' translated. aMenu addLine. aMenu add: 'refresh this menu' translated target: self selector: #fontConfigurationMenu: argument: aMenu. aMenu balloonTextForLastItem: 'Update this menu to reflect the current fonts' translated. MenuIcons decorateMenu: aMenu. ^ aMenu! Item was changed: ----- Method: Preferences class>>increaseFontSize (in category 'prefs - fonts') ----- increaseFontSize + Display uiScaleFactor: Display uiScaleFactor + 0.25.! - self changeFontSize: 3. - ! Item was changed: ----- Method: Preferences class>>restoreDefaultFonts (in category 'prefs - fonts') ----- restoreDefaultFonts - "Since this is called from menus, we can take the opportunity to prompt for missing font styles." " Preferences restoreDefaultFonts " + TheWorldMainDockingBar instance resetAllThemes.! - UserInterfaceTheme allThemes - detect: [:ea | UserInterfaceTheme current name ~= ea name - and: [UserInterfaceTheme current name includesSubstring: ea name]] - ifFound: [:ea | - (Project uiManager - confirm: ('Do you want to apply\"{1}"?' translated withCRs format: {ea name}) - title: 'Apply UI Theme' translated) ifTrue: [ea apply]] - ifNone: [self inform: 'Sorry, could not revert font choices.\Please apply a UI theme with smaller fonts.' translated withCRs].! Item was changed: ----- Method: Preferences class>>setBalloonHelpFontTo: (in category 'prefs - fonts') ----- setBalloonHelpFontTo: aFont + UserInterfaceTheme setFont: #balloonHelpFont to: aFont.! - UserInterfaceTheme current - set: #balloonHelpFont - to: aFont; - apply.! Item was changed: ----- Method: Preferences class>>setButtonFontTo: (in category 'prefs - fonts') ----- setButtonFontTo: aFont + UserInterfaceTheme setFont: #standardButtonFont to: aFont.! - UserInterfaceTheme current - set: #standardButtonFont - to: aFont; - apply.! Item was changed: ----- Method: Preferences class>>setCodeFontTo: (in category 'prefs - fonts') ----- setCodeFontTo: aFont "Establish the code font." + UserInterfaceTheme setFont: #standardCodeFont to: aFont.! - UserInterfaceTheme current - set: #standardCodeFont - to: aFont; - apply.! Item was removed: - ----- Method: Preferences class>>setDefaultFonts: (in category 'prefs - fonts') ----- - setDefaultFonts: defaultFontsSpec - "Since this is called from menus, we can take the opportunity to prompt for missing font styles." - - | fontNames map emphases | - fontNames := defaultFontsSpec collect: [:array | array second]. - map := IdentityDictionary new. - emphases := IdentityDictionary new. - fontNames do: [:originalName | | decoded style | - decoded := TextStyle decodeStyleName: originalName. - style := map at: originalName put: (TextStyle named: decoded second). - emphases at: originalName put: decoded first. - style ifNil: [map at: originalName put: TextStyle default]]. - - UserInterfaceTheme current applyAfter: [ - defaultFontsSpec do: [:triplet | self - perform: triplet first - with: (((map at: triplet second) fontOfPointSize: triplet third) emphasized: (emphases at: triplet second))]].! Item was changed: ----- Method: Preferences class>>setDemoFonts (in category 'prefs - fonts') ----- setDemoFonts + "Originally, demo fonts where just bigger fonts to be used on a larger display such as a projector. By now, we treat demo fonts as being 50% larger than what the platform*s scale factor suggests. + Preferences setDemoFonts + " - "Preferences setDemoFonts" + Display uiScaleFactor: Display platformScaleFactor * 1.5.! - | theme base | - self inform: 'The current UI theme will be copied\and larger fonts be installed.' translated withCRs. - - (UserInterfaceTheme current name beginsWith: 'Demo') - ifFalse: [ - UserInterfaceTheme allThemes - detect: [:ea | (ea name beginsWith: 'Demo') - and: [ea name endsWith: UserInterfaceTheme current name]] - ifFound: [:uit | uit apply] - ifNone: [ - "Create DEMO version of current theme." - theme := UserInterfaceTheme named: 'Demo'. - theme merge: UserInterfaceTheme current overwrite: true. - theme apply]]. - - base := (TextStyle defaultFont name beginsWith: 'Darkmap') - ifTrue: ['Darkmap DejaVu Sans'] ifFalse: ['Bitmap DejaVu Sans']. - - self setDefaultFonts: { - {#setSystemFontTo:. base. 14}. - {#setFixedFontTo:. 'BitstreamVeraSansMono'. 16}. - {#setListFontTo:. base. 14}. - {#setFlapsFontTo:. base. 12}. - {#setEToysFontTo:. base. 14}. - {#setPaintBoxButtonFontTo:. base. 14}. - {#setMenuFontTo:. base . 14}. - {#setWindowTitleFontTo:. base, ' B'. 14}. - {#setBalloonHelpFontTo:. base. 12}. - {#setCodeFontTo:. base. 14}. - {#setButtonFontTo:. base. 12}. - } - ! Item was changed: ----- Method: Preferences class>>setEToysFontTo: (in category 'prefs - fonts') ----- setEToysFontTo: aFont "change the font used in eToys environment" + UserInterfaceTheme setFont: #eToysFont to: aFont.! - UserInterfaceTheme current - set: #eToysFont - to: aFont; - apply.! Item was changed: ----- Method: Preferences class>>setEToysTitleFontTo: (in category 'prefs - fonts') ----- setEToysTitleFontTo: aFont "change the font used in eToys environment" + UserInterfaceTheme setFont: #eToysTitleFont to: aFont.! - UserInterfaceTheme current - set: #eToysTitleFont - to: aFont; - apply.! Item was changed: ----- Method: Preferences class>>setFixedFontTo: (in category 'prefs - fonts') ----- setFixedFontTo: aFont - "Establish the default fixed text font and style" + UserInterfaceTheme setFixedFontTo: aFont.! - | aStyle newDefaultStyle | - aFont ifNil: [^ self]. - aStyle := aFont textStyle ifNil: [^ self]. - - newDefaultStyle := aStyle copy. - newDefaultStyle defaultFontIndex: (aStyle fontIndexOf: aFont). - - UserInterfaceTheme current - set: #standardFixedFont to: aFont; - apply. - - TextStyle setDefaultFixed: newDefaultStyle.! Item was changed: ----- Method: Preferences class>>setFlapFontTo: (in category 'prefs - fonts') ----- setFlapFontTo: aFont + UserInterfaceTheme setFont: #standardFlapFont to: aFont. + - UserInterfaceTheme current - set: #standardFlapFont - to: aFont; - apply. - "FlapTab allSubInstancesDo: [:aFlapTab | aFlapTab reformatTextualTab]"! Item was changed: ----- Method: Preferences class>>setFlapsFontTo: (in category 'prefs - fonts') ----- setFlapsFontTo: aFont + self setFlapFontTo: aFont.! - UserInterfaceTheme current - set: #standardFlapFont - to: aFont; - apply. - - "FlapTab allSubInstancesDo: - [:aFlapTab | aFlapTab reformatTextualTab]"! Item was changed: ----- Method: Preferences class>>setHaloLabelFontTo: (in category 'prefs - fonts') ----- setHaloLabelFontTo: aFont "change the font used in eToys environment" + UserInterfaceTheme setFont: #haloLabelFont to: aFont.! - UserInterfaceTheme current - set: #haloLabelFont - to: aFont; - apply.! Item was changed: ----- Method: Preferences class>>setListFontTo: (in category 'prefs - fonts') ----- setListFontTo: aFont "Set the list font as indicated" + UserInterfaceTheme setFont: #standardListFont to: aFont. + - UserInterfaceTheme current - set: #standardListFont - to: aFont; - apply. - "Smalltalk at: #ListParagraph ifPresent: [:lp | lp initialize]. Smalltalk at: #Flaps ifPresent: [:flaps | flaps replaceToolsFlap]"! Item was changed: ----- Method: Preferences class>>setMenuFontTo: (in category 'prefs - fonts') ----- setMenuFontTo: aFont + UserInterfaceTheme setFont: #standardMenuFont to: aFont. - UserInterfaceTheme current - set: #standardMenuFont - to: aFont; - apply. "Smalltalk at: #PopUpMenu ifPresent:[:aClass| aClass setMenuFontTo: aFont]. TheWorldMainDockingBar updateInstances."! Item was changed: ----- Method: Preferences class>>setPaintBoxButtonFontTo: (in category 'prefs - fonts') ----- setPaintBoxButtonFontTo: aFont + "change the font used in the buttons in PaintBox. Etoys." - "change the font used in the buttons in PaintBox." + UserInterfaceTheme setFont: #paintBoxButtonFont to: aFont.! - UserInterfaceTheme current - set: #paintBoxButtonFont - to: aFont; - apply.! Item was changed: ----- Method: Preferences class>>setSystemFontTo: (in category 'prefs - fonts') ----- setSystemFontTo: aFont - "Establish the default text font and style" + UserInterfaceTheme setSystemFontTo: aFont.! - | aStyle newDefaultStyle | - aFont ifNil: [^ self]. - aStyle := aFont textStyle ifNil: [^ self]. - newDefaultStyle := aStyle copy. - newDefaultStyle defaultFontIndex: (aStyle fontIndexOf: aFont). - - UserInterfaceTheme current - set: #standardSystemFont to: aFont; - apply. - - TextStyle setDefault: newDefaultStyle. - Flaps replaceToolsFlap. - ScriptingSystem resetStandardPartsBin. - - ! Item was changed: ----- Method: Preferences class>>setWindowTitleFontTo: (in category 'prefs - fonts') ----- setWindowTitleFontTo: aFont "Set the window-title font to be as indicated" + UserInterfaceTheme setFont: #windowTitleFont to: aFont. + - UserInterfaceTheme current - set: #windowTitleFont - to: aFont; - apply. - "(Smalltalk hasClassNamed: #StandardSystemView) ifTrue: [(Smalltalk at: #StandardSystemView) setLabelStyle]. (Smalltalk hasClassNamed: #Flaps) ifTrue: [(Smalltalk at: #Flaps) replaceToolsFlap]" ! Item was added: + ----- Method: Project>>displayScaleChangedFrom:to: (in category 'displaying') ----- + displayScaleChangedFrom: oldFactor to: newFactor + + RealEstateAgent resetScaleFactor. "Reset cached (pixel-based) scale factor used in initialization and rendering code. See senders of #scaleFactor."! Item was removed: - ----- Method: RealEstateAgent class>>applyUserInterfaceTheme (in category 'preferences') ----- - applyUserInterfaceTheme - - ScaleFactor := nil. - ! Item was added: + ----- Method: RealEstateAgent class>>resetScaleFactor (in category 'display scale') ----- + resetScaleFactor + + ScaleFactor := nil.! Item was changed: ----- Method: RealEstateAgent class>>scaleFactor (in category 'display scale') ----- scaleFactor + "Use the default font height to calculate some factor. Note that, in a distant future, we will be able to use a method that is not based on pixels once we only use TrueType fonts all over the image and have a rendering system other than BitBlt. Then, TextStyle class >> #pixelsPerInch will suffice, considering that 96 PPI represents a scale factor of 1.0. Until then, rendering is based on pixel geometry." - "Use the default font height to calculate some factor. Better than nothing..." + ^ ScaleFactor ifNil: [ScaleFactor := (TextStyle defaultFont height / StrikeFont referenceHeight)]! - ^ ScaleFactor ifNil: [ScaleFactor := (TextStyle defaultFont height / 14 "reference value")]! Item was removed: - ----- Method: RealEstateAgent class>>themeProperties (in category 'preferences') ----- - themeProperties - - ^ { - { #scaleFactor. 'Scaling & Hi-DPI'. 'The factor to scale geometry such as window extent.' }. - }! Item was removed: - ----- Method: RealEstateAgent>>applyUserInterfaceTheme (in category 'preferences') ----- - applyUserInterfaceTheme - - "Ignore. Only class-side cache."! Item was removed: - ----- Method: RealEstateAgent>>canApplyUserInterfaceTheme (in category 'preferences') ----- - canApplyUserInterfaceTheme - "See class side." - - ^ false! Item was changed: ----- Method: SolarizedTheme class>>addDarkFonts: (in category 'instance creation') ----- addDarkFonts: theme "Set-up fonts." theme + set: #balloonHelpFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 7.5]; + set: #standardButtonFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 7.5]; + set: #standardCodeFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 10.5]; + set: #standardFlapFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 7.5 emphasized: TextEmphasis bold emphasisCode]; + set: #haloLabelFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 10.5]; + set: #standardListFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 10.5]; + set: #standardMenuFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 10.5]; + set: #standardSystemFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 10.5]; + set: #windowTitleFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 10.5].! - set: #balloonHelpFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 7]; - set: #standardButtonFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 7]; - set: #standardCodeFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 9]; - set: #standardFlapFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 7 emphasized: TextEmphasis bold emphasisCode]; - set: #haloLabelFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 9]; - set: #standardListFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 9]; - set: #standardMenuFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 9]; - set: #standardSystemFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 9]; - set: #windowTitleFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 9].! Item was changed: ----- Method: SolarizedTheme class>>addLightFonts: (in category 'instance creation') ----- addLightFonts: theme "Set-up fonts." theme + set: #balloonHelpFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 7.5]; + set: #standardButtonFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 7.5]; + set: #standardCodeFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 10.5]; + set: #standardFlapFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 7.5 emphasized: TextEmphasis bold emphasisCode]; + set: #haloLabelFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 10.5]; + set: #standardListFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 10.5]; + set: #standardMenuFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 10.5]; + set: #standardSystemFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 10.5]; + set: #windowTitleFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 10.5 emphasized: TextEmphasis bold emphasisCode].! - set: #balloonHelpFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 7]; - set: #standardButtonFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 7]; - set: #standardCodeFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 9]; - set: #standardFlapFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 7 emphasized: TextEmphasis bold emphasisCode]; - set: #haloLabelFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 9]; - set: #standardListFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 9]; - set: #standardMenuFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 9]; - set: #standardSystemFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 9]; - set: #windowTitleFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 9 emphasized: TextEmphasis bold emphasisCode].! Item was changed: ----- Method: SqueakTheme class>>addFonts: (in category 'instance creation') ----- addFonts: theme theme + set: #standardSystemFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 10.5]; + set: #standardFixedFont to: [TTCFont familyName: 'BitstreamVeraSansMono' pointSize: 10.5]; + + set: #standardCodeFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 10.5]; + set: #standardListFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 10.5]; + set: #standardButtonFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 7.5]; + set: #standardMenuFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 10.5]; + set: #standardFlapFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 7.5 emphasized: TextEmphasis bold emphasisCode]; + + set: #windowTitleFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 10.5 emphasized: TextEmphasis bold emphasisCode]; + set: #balloonHelpFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 7.5]; + set: #haloLabelFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 10.5]; + + set: #wizardStandardFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 14.5]; + set: #wizardButtonFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 14.5]; + set: #wizardHelpFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 10.5]; + set: #wizardTitleFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 23.5].! - set: #balloonHelpFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 7]; - set: #standardButtonFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 7]; - set: #standardCodeFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 9]; - set: #standardFlapFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 7 emphasized: TextEmphasis bold emphasisCode]; - set: #haloLabelFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 9]; - set: #standardListFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 9]; - set: #standardMenuFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 9]; - set: #standardSystemFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 9]; - set: #standardFixedFont to: [TTCFont familyName: 'BitstreamVeraSansMono' pointSize: 12 emphasis: 0]; - set: #windowTitleFont to: [StrikeFont familyName: 'Bitmap DejaVu Sans' pointSize: 9 emphasized: TextEmphasis bold emphasisCode]. - ! Item was added: + ----- Method: StrikeFont class>>referenceHeight (in category '*System-constants') ----- + referenceHeight + "Since Squeak 4.1, the standard system/text font has been pre-rendered to a height of 14 pixels, which are about 10.5 point in 96 PPI. We can use this value to compute the effective in-image scale factor using the current system font's height (in pixels). If that font happens to be a TTCFont, the same #pointSize can result in a different #pixelSize once PPI changes. + + StrikeFont ... 10.5 pt = 14 px in 96 ppi = 1.0 or 100% + TTCFont ... 96 ppi = 1.0 or 100% + " + + ^ 14 "pixels"! Item was added: + ----- Method: TTCFont class>>referencePointSize (in category '*System-constants') ----- + referencePointSize + "See commentary in StrikeFont class >> #referenceHeight." + + ^ 10.5! Item was changed: ----- Method: TrimTheme class>>addFonts: (in category 'instance creation') ----- addFonts: theme "Set-up fonts." theme + set: #balloonHelpFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 7.5]; + set: #standardButtonFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 7.5]; + set: #standardCodeFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 10.5]; + set: #standardFlapFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 7.5 emphasized: TextEmphasis bold emphasisCode]; + set: #haloLabelFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 10.5]; + set: #standardListFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 10.5]; + set: #standardMenuFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 10.5]; + set: #standardSystemFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 10.5]; + set: #windowTitleFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 10.5].! - set: #balloonHelpFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 7]; - set: #standardButtonFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 7]; - set: #standardCodeFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 9]; - set: #standardFlapFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 7 emphasized: TextEmphasis bold emphasisCode]; - set: #haloLabelFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 9]; - set: #standardListFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 9]; - set: #standardMenuFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 9]; - set: #standardSystemFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 9]; - set: #windowTitleFont to: [StrikeFont familyName: 'Darkmap DejaVu Sans' pointSize: 9].! Item was added: + ----- Method: UserInterfaceTheme class>>addDefaultFonts: (in category 'initialize-release') ----- + addDefaultFonts: theme + "There must be fonts installed in the default theme. Unlike all other theme properties, there are no defaults encoded throughout the system for these properties. That is, there are no #ifNil: checks when requesting a font from the current theme." + + | defaultBuilder | + defaultBuilder := TTCFont familyName: 'BitstreamVeraSans' pointSize: TTCFont referencePointSize. + #( + standardSystemFont + standardFixedFont + + standardCodeFont + standardListFont + standardButtonFont + standardMenuFont + standardFlapFont + + windowTitleFont + balloonHelpFont + haloLabelFont + + wizardStandardFont + wizardButtonFont + wizardHelpFont + wizardTitleFont + ) + do: [:symbolicName | theme set: symbolicName to: defaultBuilder].! Item was changed: ----- Method: UserInterfaceTheme class>>cleanUp: (in category 'initialize-release') ----- cleanUp: aggressive aggressive ifTrue: [ + All := Default := nil. - All := nil. SqueakTheme create; createDuller. SolarizedTheme createDark; createLight. MonokaiTheme createDark. CommunityTheme createDark. TrimTheme create].! Item was changed: ----- Method: UserInterfaceTheme class>>cleanUpAndReset (in category 'initialize-release') ----- cleanUpAndReset "Rebuild all themes and re-apply the current one by name." + + self resetAfter: [self cleanUp: true].! - - | nameToReset | - nameToReset := UserInterfaceTheme current name. - self cleanUp: true. - (self named: nameToReset) apply.! Item was changed: ----- Method: UserInterfaceTheme class>>current (in category 'accessing') ----- current + ^ Current ifNil: [Current := self default]! - ^ Current ifNil: [Current := Default]! Item was changed: ----- Method: UserInterfaceTheme class>>default (in category 'accessing') ----- default + ^ Default ifNil: [ + Default := self new. + Default name: 'Autogenerated Default'. + self addDefaultFonts: Default. + Default]! - ^ Default ifNil: [Default := self new - name: 'Autogenerated Default'; - yourself]! Item was removed: - ----- Method: UserInterfaceTheme class>>default: (in category 'accessing') ----- - default: aUserInterfaceTheme - - Default := aUserInterfaceTheme.! Item was changed: ----- Method: UserInterfaceTheme class>>reset (in category 'initialize-release') ----- reset + self current apply.! - self default apply.! Item was added: + ----- Method: UserInterfaceTheme class>>resetAfter: (in category 'initialize-release') ----- + resetAfter: aBlock + "Evaluate aBlock and re-apply the current one by name." + + | nameToReset scaleFactorToReset | + nameToReset := self current name. + scaleFactorToReset := Display uiScaleFactor. + aBlock value. + (self named: nameToReset) applyScaled: scaleFactorToReset.! Item was added: + ----- Method: UserInterfaceTheme class>>setFixedFontTo: (in category 'tools - fonts') ----- + setFixedFontTo: aFont + "Establish the default fixed text font and style" + + self setFont: #standardFixedFont to: aFont.! Item was added: + ----- Method: UserInterfaceTheme class>>setFont:to: (in category 'tools - fonts') ----- + setFont: symbolicName to: aFont + "Set symbolicName to aFont in all known UI themes. If aFont is a TrueType font, transform all themes into TTC-based ones and re-apply the current theme by name." + + aFont isTTCFont ifTrue: [ + self flag: #discuss. "mt: Should we issue a warning here?" + (self allThemes anySatisfy: [:uit | uit isTTCBased not]) + ifTrue: [self resetAfter: [ + self allThemes copy do: [:uit | uit isGenuine ifFalse: [uit unregister]]. + self allThemes do: [:uit | uit makeTTCBased]] ]]. + + self allThemes do: [:uit | + uit setFont: symbolicName to: aFont].! Item was added: + ----- Method: UserInterfaceTheme class>>setSystemFontTo: (in category 'tools - fonts') ----- + setSystemFontTo: aFont + "Establish the default text font and style" + + aFont isTTCFont not ifTrue: [ + Display uiScaleFactor = 1.0 + ifFalse: [^ self error: 'Can only set pre-rendered font for 100% scale factor']. + aFont height = StrikeFont referenceHeight + ifFalse: [^ self error: ('Incompatible pre-rendered font for 100% scale factor. Height must be {1} px' format: {StrikeFont referenceHeight})]]. + + "Documentation only. Users can increase the default font size to any value. Yet, RealEstateAgent class >> #scaleFactor will change and the system effectively render stuff larger. So, it would be a good idea to keep #pixelSize/#height of system font, list font, and menu font similar. + + (aFont isTTCFont and: [aFont pointSize ~= TTCFont referencePointSize]) + ifTrue: [self notify: ('The standard system/text font should be {1} pt. If you want to increase the overall font size, please change the screen scale factor instead. You may proceed without harm.' format: {TTCFont referencePointSize})]. + " + self setFont: #standardSystemFont to: aFont.! Item was changed: ----- Method: UserInterfaceTheme>>apply (in category 'actions') ----- apply "Apply this theme to all affected objects. Let classes decide on how to iterate and call their instances." ignoreApply == true ifTrue: [^ self]. - UserInterfaceTheme current: self. + self fixFontsAndScaleAround: [self basicApply ]. + "Project current restoreDisplay. -- not needed. Rather fix occasional draw-only issues in the respective morphs via #applyUserInterfaceTheme and #changed."! - self fixFontsAndScaleAround: [ - - self class clientClassesToReapply in: [:cc | - cc do: [:eachClass | eachClass applyUserInterfaceTheme]. - Cursor wait showWhile: [ - SystemNavigation default allObjectsDo: [:o | - ((cc includes: o class) - and: [o canApplyUserInterfaceTheme]) - ifTrue: [o applyUserInterfaceTheme]]]]. - ]. "fix fonts" - - Project current restoreDisplay.! Item was changed: ----- Method: UserInterfaceTheme>>applyAfter: (in category 'actions') ----- + applyAfter: aBlock - applyAfter: block - ignoreApply := true. lastScaleFactor := RealEstateAgent scaleFactor. + self class current: self. "Font callbacks from Preferences to here." + self ignoreApplyDuring: aBlock. + self apply.! - ^ block ensure: [ignoreApply := false. self apply]! Item was added: + ----- Method: UserInterfaceTheme>>applyScaled (in category 'private - display scale') ----- + applyScaled + "Apply the receiver but keep the current #uiScaleFactor." + + self applyScaled: Display uiScaleFactor.! Item was added: + ----- Method: UserInterfaceTheme>>applyScaled: (in category 'private - display scale') ----- + applyScaled: aFloat + "Apply the receiver with the given scale factor aFloat." + + self setScaleFactor: aFloat.! Item was added: + ----- Method: UserInterfaceTheme>>basicApply (in category 'private') ----- + basicApply + "Private. See #apply." + + self class clientClassesToReapply in: [:cc | + cc do: [:eachClass | eachClass applyUserInterfaceTheme]. + Cursor wait showWhile: [ + SystemNavigation default allObjectsDo: [:o | + ((cc includes: o class) + and: [o canApplyUserInterfaceTheme]) + ifTrue: [o applyUserInterfaceTheme]]]].! Item was added: + ----- Method: UserInterfaceTheme>>canFakeScaleFactor: (in category 'private - display scale') ----- + canFakeScaleFactor: aFloat + "Answer whether we can fake the given scale factor with pre-rendered fonts." + + self isTTCBased ifFalse: [^ true "Need to #makeTTCBased anyway."]. + (self lookupScaleFactor: 1.0) ifNil: [^ false "Without a fake 100%, we go all-in with TrueType fonts."]. + + aFloat = 1.0 ifTrue: [^ true]. + aFloat = 1.25 ifTrue: [^ true]. + aFloat = 1.5 ifTrue: [^ true]. + + ^ false! Item was added: + ----- Method: UserInterfaceTheme>>checkTheme100 (in category 'private - display scale') ----- + checkTheme100 + + | theme100 | + self flag: #isTTCBased. + theme100 := self lookupScaleFactor: 1.0. + self + assert: [theme100 notNil] + description: 'Reference theme not found!! Please reset all themes.'. + ^ theme100! Item was added: + ----- Method: UserInterfaceTheme>>copyWithScaleFactor: (in category 'private - display scale') ----- + copyWithScaleFactor: aFloat + "Duplicate the receiver and reconfigure the copy to have its #scaleFactor match factorInPercent. This method is used for preserving the reference theme, which has a 100% scale factor." + + | copy | + self + assert: [self isTTCBased not] + description: 'There is no need to duplicate themes that are already based on TrueType fonts!!'. + + copy := UserInterfaceTheme named: 'Demo'. + copy merge: self overwrite: true. + + copy name: self name. + copy set: #standardSystemFont to: nil. "We are not theme100 for the moment." + self assert: [copy localScaleFactor isNil]. + + copy setScaleFactorPreApply: aFloat. + + ^ copy! Item was added: + ----- Method: UserInterfaceTheme>>doScale100 (in category 'private - display scale') ----- + doScale100 + "Private. Use #applyScaled:. The reference theme, which has a 100% scale factor, must already be there. Look it up and apply it." + + self checkTheme100 apply. + TextStyle pixelsPerInch: 96.0. "Restore Squeak's default PPI for 100%."! Item was added: + ----- Method: UserInterfaceTheme>>doScale125 (in category 'private - display scale') ----- + doScale125 + "Private. Use #applyScaled:. This is actually about 135% because of which font sizes we have available." + + self flag: #hack. "mt: A different scale factor should not result in different point sizes being selected BUT the same point size resulting in a different pixel height." + + self setFonts: #( + standardSystemFont 14.5 + standardFixedFont 14.5 + + standardCodeFont 14.5 + standardListFont 14.5 + standardButtonFont 10.5 + standardMenuFont 14.5 + standardFlapFont 10.5 + + windowTitleFont 14.5 + balloonHelpFont 10.5 + haloLabelFont 14.5 + + wizardStandardFont 20.0 + wizardButtonFont 20.0 + wizardHelpFont 14.5 + wizardTitleFont 32.5) forceTTC: false. + + self apply. + TextStyle pixelsPerInch: 96.0. "Restore Squeak's default PPI for 100%."! Item was added: + ----- Method: UserInterfaceTheme>>doScale150 (in category 'private - display scale') ----- + doScale150 + "Private. Use #applyScaled:. Traditional 'Demo Mode'. Optimized for existing pre-rendered fonts. Does not fall back on TTC font. See #doScale:. This is actually about 157% because of which font sizes we have available." + + self flag: #hack. "mt: A different scale factor should not result in different point sizes being selected BUT the same point size resulting in a different pixel height." + + self setFonts: #( + standardSystemFont 16.5 + standardFixedFont 16.5 + + standardCodeFont 16.5 + standardListFont 16.5 + standardButtonFont 14.5 + standardMenuFont 16.5 + standardFlapFont 14.5 + + windowTitleFont 16.5 + balloonHelpFont 14.5 + haloLabelFont 16.5 + + wizardStandardFont 22.5 + wizardButtonFont 22.5 + wizardHelpFont 16.5 + wizardTitleFont 36.5) forceTTC: false. + + self apply. + TextStyle pixelsPerInch: 96.0. "Restore Squeak's default PPI for 100%."! Item was changed: + ----- Method: UserInterfaceTheme>>fixFontsAndScaleAround: (in category 'private - fonts') ----- + fixFontsAndScaleAround: applyThemeBlock + "Given that the receiver is the current UI theme, set the system's default fonts, which define RealEstateAgent's #scaleFactor. If the factor changes, resize open windows to make them fit the scaled contents. Note that themes can have arbitrary point sizes for their system font, even though it is not recommended. See TTCFont class >> #referencePointSize." - ----- Method: UserInterfaceTheme>>fixFontsAndScaleAround: (in category 'private') ----- - fixFontsAndScaleAround: block - "Due to the current situation with fonts and the real-estate manager, this is a small workaround to support theme switching with largely different font sizes." lastScaleFactor ifNil: [lastScaleFactor := RealEstateAgent scaleFactor]. "Due to the current font situation, update TextConstants." + (self get: #standardSystemFont) ifNotNil: [:font | self installSystemFont: font]. + (self get: #standardFixedFont) ifNotNil: [:font | self installFixedFont: font]. - [ ignoreApply := true. - (self get: #standardSystemFont) ifNotNil: [:font | Preferences setSystemFontTo: font]. - (self get: #standardFixedFont) ifNotNil: [:font | Preferences setFixedFontTo: font]. - RealEstateAgent applyUserInterfaceTheme. "Reset cached scale factor now. Sigh." - ] ensure: [ignoreApply := false]. + "Propagate the receiver's properties across the system." + applyThemeBlock value. - "Apply theme etc." - block value. "Due to the current real-estate manager situation, resize all windows. Works only for Morphic projects." + self scaleMorphicToolsBy: RealEstateAgent scaleFactor / lastScaleFactor. + - (RealEstateAgent scaleFactor - lastScaleFactor) abs > 0.1 ifTrue: [ - Project current isMorphic ifTrue: [ - | scale | - scale := RealEstateAgent scaleFactor / lastScaleFactor. - Project current world submorphs - select: [:ea | ea isSystemWindow] - thenDo: [:ea | - ea extent: (ea extent * scale). - ea layoutChanged. - ea setFramesForLabelArea]]]. - lastScaleFactor := nil.! Item was added: + ----- Method: UserInterfaceTheme>>ignoreApplyDuring: (in category 'actions') ----- + ignoreApplyDuring: aBlock + + ignoreApply := true. + ^ aBlock ensure: [ignoreApply := false]! Item was added: + ----- Method: UserInterfaceTheme>>installFixedFont: (in category 'private - fonts') ----- + installFixedFont: aFont + "Establish the default fixed text font and style" + + | aStyle | + self flag: #todo. "mt: Support derivatives such as bold and italic." + aStyle := aFont textStyle. + aStyle defaultFontIndex: (aStyle fontIndexOf: aFont). + TextStyle setDefaultFixed: aStyle.! Item was added: + ----- Method: UserInterfaceTheme>>installSystemFont: (in category 'private - fonts') ----- + installSystemFont: aFont + "Establish the default text font and style" + + | aStyle | + self flag: #todo. "mt: Support derivatives such as bold and italic." + aStyle := aFont textStyle. + aStyle defaultFontIndex: (aStyle fontIndexOf: aFont). + + TextStyle setDefault: aStyle. + RealEstateAgent resetScaleFactor. + + Flaps replaceToolsFlap. + ScriptingSystem resetStandardPartsBin.! Item was added: + ----- Method: UserInterfaceTheme>>isCurrent (in category 'testing') ----- + isCurrent + "Note that changes to the receiver's properties without calling #apply can result in visual differences even though the answer might be 'true'." + + ^ self class current == self! Item was added: + ----- Method: UserInterfaceTheme>>isGenuine (in category 'private - display scale') ----- + isGenuine + + self isTTCBased ifTrue: [ + "The receiver is only genuine if there is no other theme with the same same, probably one with pre-rendered fonts." + ^ (self class allThemes anySatisfy: [:theme | + theme ~~ self and: [theme name = self name]]) not]. + + ^ self localScaleFactor = 1.0! Item was added: + ----- Method: UserInterfaceTheme>>isTTCBased (in category 'private - display scale') ----- + isTTCBased + "Answer whether the receiver uses only TrueType fonts, which can flexibly adapt to changing scale factors." + + ^ (self get: #standardSystemFont) ifNil: [false] ifNotNil: [:font | font isTTCFont] + + "properties keysDo: [:key | + (key isSymbol and: [key endsWith: #Font]) + ifTrue: [(self get: key) isTTCFont ifFalse: [^ false]]]. + ^ true"! Item was added: + ----- Method: UserInterfaceTheme>>localScaleFactor (in category 'private - display scale') ----- + localScaleFactor + "Answers the scale factor that the receiver supports, which is arbitrary for themes that only use TTCFonts." + + self + assert: [self isTTCBased not] + description: 'The local scale factor is undefined for TrueType-based themes!!'. + + ^ (self get: #standardSystemFont) + ifNil: ["Not yet initialized."] + ifNotNil: [:font | (font height / StrikeFont referenceHeight) roundTo: 0.25]! Item was added: + ----- Method: UserInterfaceTheme>>lookupScaleFactor: (in category 'private - display scale') ----- + lookupScaleFactor: aFloat + "Answer a theme that fakes the given scale factor with pre-rendered fonts." + + ^ self class allThemes + detect: [:ea | ea name = self name and: [ea isTTCBased not and: [ea localScaleFactor = aFloat]]] + ifNone: ["Not found."]! Item was added: + ----- Method: UserInterfaceTheme>>lookupSimilar (in category 'private - display scale') ----- + lookupSimilar + "Answer a theme that is similar to the receiver but not the reference theme for pre-rendered fonts." + + ^ self class allThemes + detect: [:ea | ea name = self name and: [ea isTTCBased or: [ea localScaleFactor ~= 1.0]]] + ifNone: ["Not found."]! Item was added: + ----- Method: UserInterfaceTheme>>makeTTCBased (in category 'private - display scale') ----- + makeTTCBased + "100%" + + self isTTCBased ifTrue: [^ self]. + + self setFonts: #( + standardSystemFont 10.5 + standardFixedFont 10.5 + + standardCodeFont 10.5 + standardListFont 10.5 + standardButtonFont 7.5 + standardMenuFont 10.5 + standardFlapFont 7.5 + + windowTitleFont 10.5 + balloonHelpFont 7.5 + haloLabelFont 10.5 + + wizardStandardFont 14.5 + wizardButtonFont 14.5 + wizardHelpFont 10.5 + wizardTitleFont 23.5) forceTTC: true. + + self assert: [self isTTCBased].! Item was changed: ----- Method: UserInterfaceTheme>>printOn: (in category 'printing') ----- printOn: aStream + super printOn: aStream. + + aStream space; print: name. + self isTTCBased ifFalse: [ + aStream space; nextPutAll: ('({1}%)' format: {self localScaleFactor * 100})].! - aStream space; print: name! Item was changed: ----- Method: UserInterfaceTheme>>register (in category 'initialization') ----- register + self class allThemes add: self.! Item was added: + ----- Method: UserInterfaceTheme>>scaleMorphicToolsBy: (in category 'private - fonts') ----- + scaleMorphicToolsBy: factor + + Project current isMorphic ifFalse: [^ self]. + (factor closeTo: 1) ifTrue: [^ self]. + + Project current world submorphs + select: [:morph | morph isSystemWindow] + thenDo: [:window | + window extent: window extent * factor. + window layoutChanged. + window setFramesForLabelArea].! Item was added: + ----- Method: UserInterfaceTheme>>setFixedFontTo: (in category 'private - fonts') ----- + setFixedFontTo: aFont + "Establish the default fixed text font and style" + + self setFont: #standardFixedFont to: aFont.! Item was added: + ----- Method: UserInterfaceTheme>>setFont:to: (in category 'private - fonts') ----- + setFont: symbolicName to: aFont + "Establish the default text font and style" + + self set: symbolicName to: aFont. + self isCurrent ifTrue: [self apply].! Item was added: + ----- Method: UserInterfaceTheme>>setFonts:forceTTC: (in category 'private - display scale') ----- + setFonts: specs forceTTC: forceTTC + "Change fonts. Do not apply the receiver. Replace StrikeFont with TTCFont if forceTTC or target pointSize not available." + + | theme100 | + theme100 := self checkTheme100. + + specs groupsDo: [:symbolicFontName :newPointSize | | font100 fontScaled | + font100 := theme100 get: symbolicFontName. + fontScaled := font100 isTTCFont + ifTrue: [TTCFont familyName: font100 familyName pointSize: newPointSize emphasis: font100 emphasis] + ifFalse: [StrikeFont familyName: font100 familyName pointSize: newPointSize emphasized: font100 emphasis]. + (fontScaled pointSize ~= newPointSize or: [forceTTC and: [fontScaled isTTCFont not]]) + ifTrue: [fontScaled := TTCFont familyName: self ttcFallbackName pointSize: newPointSize emphasis: font100 emphasis]. + self assert: [fontScaled pointSize = newPointSize]. + self set: symbolicFontName to: fontScaled].! Item was added: + ----- Method: UserInterfaceTheme>>setScaleFactor: (in category 'private - display scale') ----- + setScaleFactor: aFloat + "Private. Use #applyScaled:. In the receiver, change the fonts to have a scale of aFloat. Change all fonts to be TrueType fonts if no pre-rendered fonts exist. Never change the 100% reference theme but make a copy. Apply the receiver to the system." + + (self isTTCBased not and: [aFloat = self localScaleFactor]) + ifTrue: [self isCurrent ifFalse: [self apply]. ^ self]. + + (self isTTCBased not and: [self localScaleFactor = 1.0]) "!!!! Never change the reference theme !!!!" + ifTrue: [^ self lookupSimilar ifNil: [self copyWithScaleFactor: aFloat] ifNotNil: [:other | other setScaleFactorPreApply: aFloat]]. + + aFloat = 1.0 ifTrue: [^ self doScale100]. + aFloat = 1.25 ifTrue: [^ self doScale125]. + aFloat = 1.5 ifTrue: [^ self doScale150]. + + "And now transition from the pre-rendered world into the TrueType world. Or re-use an existing TrueType-based theme with new values. See #lookupSimilar above." + TextStyle pixelsPerInch: 96.0 * RealEstateAgent scaleFactor "current, based on pixels". + self makeTTCBased. + self applyAfter: [TextStyle pixelsPerInch: 96.0 * aFloat "new, not rounded"].! Item was added: + ----- Method: UserInterfaceTheme>>setScaleFactorPreApply: (in category 'private - display scale') ----- + setScaleFactorPreApply: aFloat + + | last | + last := Current. + [Current := self. "Manage side-effects in #setDefaultFonts: ..." + self setScaleFactor: aFloat] + on: Error do: [:ex | Current := last. ex pass].! Item was added: + ----- Method: UserInterfaceTheme>>ttcFallbackName (in category 'private - display scale') ----- + ttcFallbackName + "Answer the name of the TTCFont that should be used as a fallback for pre-rendered StrikeFonts that do not have the requested #pointSize available." + + ^ 'BitstreamVeraSans'! Item was changed: + (PackageInfo named: 'System') postscript: 'UserInterfaceTheme allThemes do: [:each | + "Convert ''Demo + Squeak'' to ''Squeak''. Not needed anymore because of #scaleFactor in each theme." + each name: (each name findTokens: ''+'') last withBlanksTrimmed]. + + "Font definitions changed in all UI themes due to PPI conversion above. Wizard fonts have been added." + UserInterfaceTheme cleanUpAndReset.'! - (PackageInfo named: 'System') postscript: 'Smalltalk removeClassNamed: #Abort.'!

1 0

The Trunk: Morphic-mt.1837.mcz
by commits＠source.squeak.org 30 Dec '21

30 Dec '21

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.1837.mcz ==================== Summary ==================== Name: Morphic-mt.1837 Author: mt Time: 30 December 2021, 4:23:41.536748 pm UUID: 45a76a8e-1cf7-0944-8f69-cc3d121f6e9c Ancestors: Morphic-mt.1836 Complements Graphics-mt.455 =============== Diff against Morphic-mt.1836 =============== Item was added: + ----- Method: MorphicProject>>displayScaleChangedFrom:to: (in category 'display') ----- + displayScaleChangedFrom: oldFactor to: newFactor + "Update Morphic-specific geometry. Try to be more efficient than UI theme's #applyUserInterfaceTheme." + + super displayScaleChangedFrom: oldFactor to: newFactor. + + "Switching UI themes involves updating geometry for different fonts anyway. Maybe we can speed up this at some point by avoiding to refresh non-geometry properties such as colors." + UserInterfaceTheme current + basicApply; + scaleMorphicToolsBy: newFactor / oldFactor. + ! Item was added: + ----- Method: TheWorldMainDockingBar>>chooseCustomScaleFactor (in category 'submenu - extras') ----- + chooseCustomScaleFactor + + | result | + result := Project uiManager request: 'Please enter a scale factor in %' translated initialAnswer: '350'. + result ifEmpty: [^ self]. + [result := result asInteger abs] ifError: [^ self]. + result < 100 ifTrue: [^ self]. + Display relativeUiScaleFactor: result / 100.! Item was changed: ----- Method: TheWorldMainDockingBar>>extrasMenuOn: (in category 'submenu - extras') ----- extrasMenuOn: aDockingBar aDockingBar addItem: [ :it| it contents: 'Extras' translated; addSubMenu: [:menu| menu addItem:[:item| item contents: 'Recover Changes' translated; help: 'Recover changes after a crash' translated; icon: MenuIcons smallDocumentClockIcon; target: ChangeList; selector: #browseRecentLog]. menu addItem:[:item| item contents: 'Recover Method Versions' translated; help: 'Recover versions of deleted methods' translated; target: ChangeList; selector: #browseMethodVersions]. menu addLine. menu addItem:[:item| item contents: 'Themes & Colors' translated; subMenuUpdater: self selector: #themesAndWindowColorsOn: ]. menu addItem:[:item| item + contents: 'Scale Factor' translated; + subMenuUpdater: self + selector: #scaleFactorsOn:]. + menu addItem:[:item| + item contents: 'Language' translated; subMenuUpdater: self selector: #languageTranslatorsOn: ]. menu addItem:[:item| item contents: 'Set Author Initials' translated; help: 'Sets the author initials' translated; icon: MenuIcons smallUserQuestionIcon; target: Utilities; selector: #setAuthorInitials]. menu addItem:[:item| item contents: 'Restore Display (r)' translated; help: 'Redraws the entire display' translated; target: Project current; selector: #restoreDisplay]. menu addItem:[:item| item contents: 'Rebuild Menus' translated; help: 'Rebuilds the menu bar' translated; target: TheWorldMainDockingBar; selector: #updateInstances]. menu addLine. menu addItem:[:item| item contents: 'Start Profiler' translated; help: 'Starts the profiler' translated; icon: MenuIcons smallTimerIcon; target: self; selector: #startMessageTally]. menu addItem:[:item| item contents: 'Collect Garbage' translated; help: 'Run the garbage collector and report space usage' translated; target: Utilities; selector: #garbageCollectAndReport]. menu addItem:[:item| item contents: 'Purge Undo Records' translated; help: 'Save space by removing all the undo information remembered in all projects' translated; target: CommandHistory; selector: #resetAllHistory]. menu addItem:[:item| item contents: 'VM statistics' translated; help: 'Virtual Machine information' translated; target: self; selector: #vmStatistics]. menu addLine. menu addItem:[:item| item contents: 'Graphical Imports' translated; help: 'View the global repository called ImageImports; you can easily import external graphics into ImageImports via the FileList' translated; target: (Imports default); selector: #viewImages]. menu addItem:[:item| item contents: 'Standard Graphics Library' translated; help: 'Lets you view and change the system''s standard library of graphics' translated; target: ScriptingSystem; selector: #inspectFormDictionary]. menu addItem:[:item| item contents: 'Annotation Setup' translated; help: 'Click here to get a little window that will allow you to specify which types of annotations, in which order, you wish to see in the annotation panes of browsers and other tools' translated; target: Preferences; selector: #editAnnotations]. menu addItem:[:item| item contents: 'Browse My Changes' translated; help: 'Browse all of my changes since the last time #condenseSources was run.' translated; target: SystemNavigation new; selector: #browseMyChanges]. ] ]! Item was added: + ----- Method: TheWorldMainDockingBar>>resetAllThemes (in category 'submenu - extras') ----- + resetAllThemes + + (Project uiManager confirm: 'Do you want to reset all UI themes\to their original state?\\(The current theme and scale factor\will be restored if possible.)' withCRs translated title: 'Reset All Themes') + ifTrue: [UserInterfaceTheme cleanUpAndReset].! Item was added: + ----- Method: TheWorldMainDockingBar>>scaleFactorsOn: (in category 'submenu - extras') ----- + scaleFactorsOn: menu + + | presets currentScaleFactor currentPlatformScaleFactor | + currentScaleFactor := (Display relativeUiScaleFactor * 100) rounded. + currentPlatformScaleFactor := Display platformScaleFactorKnown + ifTrue: [(Display platformScaleFactor * 100) rounded]. + presets := 100 to: 300 by: 25. + + presets do: [:scale | + scale = 175 ifTrue: [menu addLine]. "TTCFont used after this line..." + menu addItem: [:item| + item + contents: ('{1}{2}%{3}' format: { + currentScaleFactor = scale ifTrue: ['<yes>'] ifFalse: ['<no>']. + scale. + DisplayScreen relativeScaleFactorEnabled + ifTrue: ['' "macOS"] ifFalse: [ + scale = currentPlatformScaleFactor + ifTrue: [' (recommended)'] ifFalse: ['']] + }); + target: Display; + selector: #relativeUiScaleFactor:; + arguments: {scale / 100}]]. + + menu addLine. + menu addItem: [:item | + item + contents: ((presets includes: currentScaleFactor) not ifTrue: ['<yes> Custom: ', currentScaleFactor, '% ...'] ifFalse: ['<no>Other scale factor...']); + target: self; + selector: #chooseCustomScaleFactor].! Item was changed: ----- Method: TheWorldMainDockingBar>>themesAndWindowColorsOn: (in category 'submenu - extras') ----- themesAndWindowColorsOn: menu | themes | menu addItem:[:item| item + contents: 'Fonts' translated; + subMenuUpdater: Preferences + selector: #fontConfigurationMenu:; + icon: MenuIcons smallFontsIcon]. + menu addLine. + menu addItem:[:item| + item contents: (Model useColorfulWindows ifTrue: ['<yes>'] ifFalse: ['<no>']), 'Colorful Windows' translated; target: self; selector: #toggleColorfulWindows]. menu addItem:[:item| item contents: (SystemWindow gradientWindow not ifTrue: ['<yes>'] ifFalse: ['<no>']), 'Flat Widget Look' translated; target: self; selector: #toggleGradients]. menu addLine. menu addItem:[:item | item contents: (((Preferences valueOfFlag: #menuAppearance3d ifAbsent: [false]) and: [Morph useSoftDropShadow]) ifTrue: ['<yes>'] ifFalse: ['<no>']), 'Soft Shadows' translated; target: self; selector: #toggleSoftShadows]. menu addItem:[:item | item contents: (((Preferences valueOfFlag: #menuAppearance3d ifAbsent: [false]) and: [Morph useSoftDropShadow not]) ifTrue: ['<yes>'] ifFalse: ['<no>']), 'Hard Shadows' translated; target: self; selector: #toggleHardShadows]. menu addLine. menu addItem:[:item | item contents: (SystemWindow roundedWindowCorners ifTrue: ['<yes>'] ifFalse: ['<no>']), 'Rounded Window/Dialog/Menu Look' translated; target: self; selector: #toggleRoundedWindowLook]. menu addItem:[:item | item contents: (PluggableButtonMorph roundedButtonCorners ifTrue: ['<yes>'] ifFalse: ['<no>']), 'Rounded Button/Scrollbar Look' translated; target: self; selector: #toggleRoundedButtonLook]. menu addLine. themes := UserInterfaceTheme allThemes asArray sort: #name ascending. + themes := themes select: [ :each | each isGenuine]. themes ifEmpty: [ menu addItem: [ :item | item contents: '(No UI themes found.)' translated; isEnabled: false ] ]. themes do: [ :each | menu addItem: [ :item | item + contents: (UserInterfaceTheme current name = each name ifTrue: ['<yes>'] ifFalse: ['<no>']), each name; - contents: (UserInterfaceTheme current == each ifTrue: ['<yes>'] ifFalse: ['<no>']), each name; target: each; + selector: #applyScaled ] ]. - selector: #apply ] ]. - menu - addLine; - add: 'Increase Font Size' translated target: Preferences selector: #increaseFontSize; - add: 'Decrease Font Size' translated target: Preferences selector: #decreaseFontSize. menu addLine; - add: 'Set High-DPI Mode' translated target: Preferences selector: #setDemoFonts; add: 'Set Etoys Mode' translated target: ReleaseBuilderSqueakland selector: #setEtoysMode. menu addLine; + add: 'Restore UI theme background' translated target: self selector: #restoreThemeBackground; + add: 'Reset all UI themes' translated target: self selector: #resetAllThemes; + add: 'Edit current UI theme...' translated target: self selector: #editCurrentTheme.! - add: 'Restore UI Theme Background' translated target: self selector: #restoreThemeBackground; - add: 'Edit Current UI Theme...' translated target: self selector: #editCurrentTheme.! Item was changed: ----- Method: WorldState>>doOneCycleNowFor: (in category 'update cycle') ----- doOneCycleNowFor: aWorld "Immediately do one cycle of the interaction loop. This should not be called directly, but only via doOneCycleFor:" | capturingGesture | + DisplayScreen checkForNewScreenScaleFactor; checkForNewScreenSize. - DisplayScreen checkForNewScreenSize. capturingGesture := false. "self flag: #bob. " "need to consider remote hands in lower worlds" "process user input events" LastCycleTime := Time millisecondClockValue. self handsDo: [:hand | hand becomeActiveDuring: [ hand processEvents. capturingGesture := capturingGesture or: [hand isCapturingGesturePoints]]]. "The gesture recognizer needs enough points to be accurate. Therefore morph stepping is disabled while capturing points for the recognizer" capturingGesture ifFalse: [ aWorld runStepMethods. "there are currently some variations here" self displayWorldSafely: aWorld].! Item was changed: + (PackageInfo named: 'Morphic') postscript: '"Fix missing command key shortcuts such as [cmd]+[+/-] for scale changes." + Project allMorphicProjects do: [:p | p world initializeDesktopCommandKeySelectors]. + + "New ''scale factor'' menu" + TheWorldMainDockingBar updateInstances.'! - (PackageInfo named: 'Morphic') postscript: 'Editor initialize. "Removes US-layout specific keyboard shortcuts for ''Enclose selection'' in favor of the cross-platform compatible preference ''Enclose selection with brackets''."'!

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 December 2021