FontPanel.st
changeset 5446 91efc544e8de
parent 5190 a02b847bef56
child 5447 0312bb04361c
--- a/FontPanel.st	Sun Oct 04 20:58:35 2015 +0200
+++ b/FontPanel.st	Sun Oct 04 23:42:08 2015 +0200
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libwidg' }"
 
+"{ NameSpace: Smalltalk }"
+
 DialogBox subclass:#FontPanel
 	instanceVariableNames:'previewField listOfEncodings allFonts fontsPerFamily familyList
 		faceList sizeList revertButton currentFamily currentFace
@@ -824,7 +826,7 @@
     ].
     sz := Number readFrom:currentSize.
     szUnitUsed := sizeUnit.
-    (currentSize endsWith:'px') ifTrue:[
+    (currentSize endsWith:#px) ifTrue:[
         szUnitUsed := #px.
     ].
 
@@ -838,10 +840,10 @@
     fonts := familyFonts
                 select:[:fntDescr |
                     fntDescr face = currentFace
-                    and:[ fntDescr style = currentStyle
-                    and:[ (szUnitUsed == #px)
-                            ifTrue:[ (fntDescr pixelSize = sz) or:[ fntDescr isScaledFont] ]
-                            ifFalse:[ (fntDescr size = sz) or:[ fntDescr isScaledFont] ]]]
+                    and:[fntDescr style = currentStyle
+                    and:[fntDescr isScaledFont
+                            or:[sz = (szUnitUsed == #px  
+                                        ifTrue:[fntDescr pixelSize] ifFalse:[fntDescr size])]]]
                 ].
 
     fonts isEmpty ifTrue:[
@@ -1474,10 +1476,10 @@
 !FontPanel class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/FontPanel.st,v 1.133 2014-11-28 10:00:17 stefan Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libwidg/FontPanel.st,v 1.133 2014-11-28 10:00:17 stefan Exp $'
+    ^ '$Header$'
 ! !