--- a/CompoundFont.st Wed Jul 24 20:04:46 2002 +0200
+++ b/CompoundFont.st Wed Jul 24 20:48:36 2002 +0200
@@ -210,8 +210,7 @@
].
characterToFontMapping at:char put:aFont.
- maxAscent := maxDescent := nil.
-
+ maxAscent := maxDescent := maxHeight := nil.
!
graphicsDevice
@@ -239,16 +238,16 @@
wString := font widthOf:aString from:i1 to:i2.
opaque ifTrue:[
- (font maxAscent < maxAscent
- or:[font maxDescent < maxDescent])
- ifTrue:[
+"/ (font ascent < maxAscent
+"/ or:[font descent < maxDescent])
+"/ ifTrue:[
aGC
fillRectangleX:x
- y:y-maxAscent+1
+ y:y-maxAscent
width:wString
height:maxAscent+maxDescent
color:aGC backgroundPaint.
- ].
+"/ ].
].
font displayString:s from:i1 to:i2 x:x y:y in:aGC opaque:opaque.
x := x + wString.
@@ -401,5 +400,5 @@
!CompoundFont class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/CompoundFont.st,v 1.7 2002-07-24 18:04:33 mb Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/CompoundFont.st,v 1.8 2002-07-24 18:48:27 mb Exp $'
! !