--- a/HierarchicalItem.st Thu Sep 16 15:45:17 1999 +0200
+++ b/HierarchicalItem.st Fri Sep 17 17:55:49 1999 +0200
@@ -826,7 +826,7 @@
!HierarchicalItem methodsFor:'protocol displaying'!
-displayOn:aGC x:xL y:yT toX:xR y:yB
+displayOn:aGC x:x y:y h:h
"draw the receiver in the graphicsContext, aGC.
"
|label
@@ -834,37 +834,37 @@
x0 "{ Class:SmallInteger }"
y0 "{ Class:SmallInteger }"
ascent "{ Class:SmallInteger }"
- h "{ Class:SmallInteger }"
+ xMax "{ Class:SmallInteger }"
|
(label := self label) isNil ifTrue:[
^ self
].
- h := yB - yT.
(label isSequenceable and:[label isString not]) ifFalse:[
- y0 := yT - ((label heightOn:aGC) + 1 - h // 2).
+ y0 := y - ((label heightOn:aGC) + 1 - h // 2).
label isImageOrForm ifTrue:[
- label displayOn:aGC x:xL y:y0
+ label displayOn:aGC x:x y:y0
] ifFalse:[
- label displayOn:aGC x:xL y:(y0 + aGC font ascent)
+ label displayOn:aGC x:x y:(y0 + aGC font ascent)
].
^ self
].
- x0 := xL.
+ xMax := aGC clippingBounds right.
+ x0 := x.
ascent := aGC font ascent.
label do:[:el|
el notNil ifTrue:[
- y0 := yT - ((el heightOn:aGC) + 1 - h // 2).
+ y0 := y - ((el heightOn:aGC) + 1 - h // 2).
el isImageOrForm ifFalse:[
y0 := y0 + ascent
].
el displayOn:aGC x:x0 y:y0.
x0 := x0 + 5 + (el widthOn:aGC).
- x0 < xR ifFalse:[
+ x0 < xMax ifFalse:[
^ self
]
]
@@ -1185,5 +1185,5 @@
!HierarchicalItem class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/HierarchicalItem.st,v 1.8 1999-08-27 15:34:38 tm Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg2/HierarchicalItem.st,v 1.9 1999-09-17 15:55:30 cg Exp $'
! !