--- a/XWorkstation.st Wed Jul 09 01:11:15 2014 +0200
+++ b/XWorkstation.st Wed Jul 09 01:19:21 2014 +0200
@@ -1619,6 +1619,10 @@
"return true, if this device supports xft (truetype) fonts."
^ self hasRenderExtension
+
+ "
+ Display supportsXFTFonts
+ "
!
usableHeightAt:aPoint
@@ -7476,23 +7480,23 @@
|names|
listOfXFonts isNil ifTrue:[
- names := self getAvailableFontsMatching:'*'.
- names isNil ifTrue:[
- "no names returned ..."
- ^ nil
- ].
- listOfXFonts := names collect:[:aName | self fontDescriptionFromXFontName:aName].
- listOfXFonts := FontDescription genericFonts, listOfXFonts.
+ names := self getAvailableFontsMatching:'*'.
+ names isNil ifTrue:[
+ "no names returned ..."
+ ^ nil
+ ].
+ listOfXFonts := names collect:[:aName | self fontDescriptionFromXFontName:aName].
+ listOfXFonts := FontDescription genericFonts, listOfXFonts.
].
(XftFontDescription notNil
- and:[ XftFontDescription isLoaded
- and:[ true "self queryXftLibrary" ]]
+ and:[ XftFontDescription isLoaded
+ and:[ self supportsXFTFonts ]]
) ifTrue:[
- UserPreferences current useXftFontsOnly ifTrue:[
- ^ (XftFontDescription listOfAvailableFonts)
- ].
- ^ listOfXFonts , (XftFontDescription listOfAvailableFonts).
+ UserPreferences current useXftFontsOnly ifTrue:[
+ ^ (XftFontDescription listOfAvailableFonts)
+ ].
+ ^ listOfXFonts , (XftFontDescription listOfAvailableFonts).
].
^ listOfXFonts
@@ -13290,11 +13294,11 @@
!XWorkstation class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.594 2014-07-01 13:39:53 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.595 2014-07-08 23:19:21 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.594 2014-07-01 13:39:53 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.595 2014-07-08 23:19:21 cg Exp $'
!
version_SVN