Skip to content

Commit 375e4b2

Browse files
committed
Fix property sheet error in labelMorph on Mac OS X
This fixes #4. On Mac OS X the 'scalableFont' property does not exist in the windowCanvas for quartz. This adds it by falling back on the X11 implementation. This commit also adds a 'verdana' font entry to the list of X11 fonts allow Verdana to display and be selected in the property sheet. On Mac OS X this correctly results in Verdana displaying. On Linux without Verdana it falls back to the default, Times.
1 parent 984e89e commit 375e4b2

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

objects/ui2/canvas.self

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2186,6 +2186,13 @@ the pixmapCache some day.
21862186
pixmap <- bootstrap stub -> 'globals' -> 'quartzGlobals' -> 'bufferCanvas' -> ().
21872187
} | )
21882188

2189+
bootstrap addSlotsTo: bootstrap stub -> 'traits' -> 'quartzWindowCanvas' -> () From: ( | {
2190+
'Category: portable accessing\x7fModuleInfo: Module: canvas InitialContents: FollowSlot\x7fVisibility: public'
2191+
2192+
scalableFont = ( |
2193+
| x11Globals scalableFont).
2194+
} | )
2195+
21892196
bootstrap addSlotsTo: bootstrap stub -> 'traits' -> 'xPixmapCanvas' -> () From: ( | {
21902197
'Category: converting ui2Image\'s\x7fModuleInfo: Module: canvas InitialContents: FollowSlot\x7fVisibility: public'
21912198

objects/ui2/scalableFont.self

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'Sun-$Revision: 30.10 $'
22
'
3-
Copyright 1992-2011 AUTHORS.
4-
See the legal/LICENSE file for license information and legal/AUTHORS for authors.
3+
Copyright 1992-2012 AUTHORS.
4+
See the LICENSE file for license information.
55
'
66

77

@@ -594,6 +594,12 @@ I print out as asterisks.\x7fModuleInfo: Module: scalableFont InitialContents: F
594594
urwAvantGardeItalic = '-*-itc avant garde-medium-o-normal-sans-'.
595595
} | )
596596

597+
bootstrap addSlotsTo: bootstrap stub -> 'globals' -> 'x11Globals' -> 'fontFamily' -> () From: ( | {
598+
'ModuleInfo: Module: scalableFont InitialContents: FollowSlot'
599+
600+
verdana = '-*-verdana-medium-r-normal-sans-'.
601+
} | )
602+
597603
bootstrap addSlotsTo: bootstrap stub -> 'globals' -> 'x11Globals' -> 'fontFamily' -> () From: ( | {
598604
'ModuleInfo: Module: scalableFont InitialContents: FollowSlot'
599605

0 commit comments

Comments
 (0)