--- a/FontDescription.st Wed Feb 18 19:05:44 2009 +0100
+++ b/FontDescription.st Wed Feb 18 20:52:22 2009 +0100
@@ -728,8 +728,11 @@
or:[ style = 'oblique' and:[aFont style = 'italic']]]) ifFalse:[ ^ false ].
(encoding isNil or:[encoding = aFont encoding]) ifFalse:[ ^ false ].
(sizeUnit ? #pt) = aFont sizeUnit ifFalse:[ ^ false ].
- ((pixelSize notNil and:[pixelSize == aFont pixelSize])
- or:[pixelSize isNil and:[ size = aFont size ]]) ifFalse:[ ^ false ].
+ (sizeUnit ? #pt) == #pt ifTrue:[
+ (size = aFont size) ifFalse:[ ^ false ].
+ ] ifFalse:[
+ (pixelSize = aFont pixelSize) ifFalse:[ ^ false ].
+ ].
^ true
! !
@@ -1354,7 +1357,7 @@
!FontDescription class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/FontDescription.st,v 1.68 2009-02-18 17:56:26 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/FontDescription.st,v 1.69 2009-02-18 19:52:22 cg Exp $'
! !
FontDescription initialize!