--- a/FontPanel.st Thu Nov 27 00:54:34 2014 +0100
+++ b/FontPanel.st Thu Nov 27 02:47:30 2014 +0100
@@ -817,18 +817,25 @@
fontForPreview
"get the preview font"
- |fontShown fonts sz szUnitUsed|
+ |fontShown familyFonts fonts sz szUnitUsed|
currentSize isNil ifTrue:[
^ nil.
].
- sz := Integer readFrom:currentSize.
+ sz := Number readFrom:currentSize.
szUnitUsed := sizeUnit.
(currentSize endsWith:'px') ifTrue:[
szUnitUsed := #px.
].
- fonts := (fontsPerFamily at:currentFamily)
+ familyFonts := fontsPerFamily at:currentFamily ifAbsent:nil.
+ familyFonts isNil ifTrue:[
+ familyFonts := fontsPerFamily at:currentFamily asUppercaseFirst ifAbsent:nil.
+ familyFonts isNil ifTrue:[
+ ^ nil
+ ].
+ ].
+ fonts := familyFonts
select:[:fntDescr |
fntDescr face = currentFace
and:[ fntDescr style = currentStyle
@@ -837,6 +844,10 @@
ifFalse:[ (fntDescr size = sz) or:[ fntDescr isScaledFont] ]]]
].
+ fonts isEmpty ifTrue:[
+ ^ nil
+ ].
+
fonts size > 1 ifTrue:[
'FontPanel [info]: huh - multiple entries: ' infoPrint. fonts infoPrintCR.
].
@@ -1463,10 +1474,10 @@
!FontPanel class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/FontPanel.st,v 1.131 2014-11-26 23:54:34 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/FontPanel.st,v 1.132 2014-11-27 01:47:30 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libwidg/FontPanel.st,v 1.131 2014-11-26 23:54:34 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/FontPanel.st,v 1.132 2014-11-27 01:47:30 cg Exp $'
! !