--- a/DataSetLabel.st Thu Feb 27 15:45:44 2003 +0100
+++ b/DataSetLabel.st Fri Feb 28 14:24:49 2003 +0100
@@ -97,7 +97,6 @@
label isNil ifTrue:[ ^ self ].
gcFont := aGC font.
-
font notNil ifTrue:[
aGC font:font.
ascent := font ascent
@@ -138,15 +137,17 @@
].
].
"/ y := shownLabel isImageOrForm ifTrue:[y0] ifFalse:[y0 + ascent].
- y := shownLabel isString ifTrue:[y0 + ascent] ifFalse:[y0].
- shownLabel displayOn:aGC x:x y:y.
+ "/ y := shownLabel isString ifTrue:[y0 + ascent] ifFalse:[y0].
+ shownLabel displayOn:aGC x:x y:y0 + (shownLabel ascentOn:aGC).
y0 := y0 + (shownLabel heightOn:aGC).
mustUndoClip == true ifTrue:[
aGC clippingRectangle:prevClip
].
].
- font notNil ifTrue:[aGC font:gcFont]. "/ restore font
+ font notNil ifTrue:[
+ aGC font:gcFont "/ restore font
+ ].
! !
!DataSetLabel methodsFor:'instance creation'!
@@ -303,5 +304,5 @@
!DataSetLabel class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/DataSetLabel.st,v 1.15 2003-02-24 11:14:11 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg2/DataSetLabel.st,v 1.16 2003-02-28 13:24:49 cg Exp $'
! !