class: FontPanel
comment/format in: #fontFromUserInitial:title:filter:encoding:enabled:
changed:
#initialFont:
#okPressed
--- a/FontPanel.st Sun Mar 16 22:25:09 2014 +0100
+++ b/FontPanel.st Sun Mar 16 23:46:05 2014 +0100
@@ -488,6 +488,7 @@
|encoding|
selectedFont := aFont.
+ xftFontsOnlyHolder value:(aFont isXftFont).
encoding := aFont encoding.
sizeUnit := aFont sizeUnit.
@@ -1208,14 +1209,16 @@
self hide.
okAction notNil ifTrue:[
currentFamily notNil ifTrue:[
- okAction
- value:(FontDescription
- family:currentFamily
- face:currentFace
- style:currentStyle
- size:currentSize
- sizeUnit:(sizeUnit ? #pt)
- encoding:(currentEncoding ? encoding)).
+ okAction value:
+ ((xftFontsOnlyHolder value
+ ifTrue:[XftFontDescription]
+ ifFalse:[FontDescription])
+ family:currentFamily
+ face:currentFace
+ style:currentStyle
+ size:currentSize
+ sizeUnit:(sizeUnit ? #pt)
+ encoding:(currentEncoding ? encoding)).
]
]
@@ -1272,10 +1275,10 @@
!FontPanel class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/FontPanel.st,v 1.113 2014-03-16 21:06:06 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/FontPanel.st,v 1.114 2014-03-16 22:46:05 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libwidg/FontPanel.st,v 1.113 2014-03-16 21:06:06 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/FontPanel.st,v 1.114 2014-03-16 22:46:05 cg Exp $'
! !