--- a/DeviceWorkstation.st Sun Mar 16 22:12:09 2014 +0100
+++ b/DeviceWorkstation.st Sun Mar 16 22:17:37 2014 +0100
@@ -5474,18 +5474,18 @@
|fonts|
fonts := self
- fontsInFamily:aFamilyName face:aFaceName style:aStyleName
- filtering:[:f |
- f size notNil
- and:[filterBlock isNil or:[filterBlock value:f]]
- ].
+ fontsInFamily:aFamilyName face:aFaceName style:aStyleName
+ filtering:[:f |
+ (f size notNil or:[f isScaledFont])
+ and:[filterBlock isNil or:[filterBlock value:f]]
+ ].
fonts size == 0 ifTrue:[^ nil].
^ fonts collect:[:descr | descr size].
"
Display sizesInFamily:'fixed' face:'medium' style:'roman' filtering:[:f |
- f encoding notNil and:[f encoding startsWith:'jis']]
+ f encoding notNil and:[f encoding startsWith:'jis']]
"
"Created: 27.2.1996 / 01:37:56 / cg"
@@ -8315,11 +8315,11 @@
!DeviceWorkstation class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.605 2014-02-28 23:56:39 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.606 2014-03-16 21:17:37 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.605 2014-02-28 23:56:39 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.606 2014-03-16 21:17:37 cg Exp $'
! !