--- a/FramedBox.st Wed Aug 05 10:47:11 1998 +0200
+++ b/FramedBox.st Wed Aug 05 16:39:50 1998 +0200
@@ -498,6 +498,9 @@
halfSepY := verticalSpace.
].
+ halfSepX := halfSepX + margin.
+ halfSepY := halfSepY + margin.
+
w := width - halfSepX - halfSepX.
h := height - halfSepY - halfSepY.
@@ -558,31 +561,31 @@
"
label at top
"
- y := font ascent.
+ y := font ascent + margin.
] ifFalse:[
"
label at bottom
"
- y := height - font descent.
+ y := height - margin - font descent.
].
(labelPosition == #topLeft
or:[labelPosition == #bottomLeft]) ifTrue:[
"
label at left
"
- x := font height
+ x := font height + margin
] ifFalse:[
(labelPosition == #topRight
or:[labelPosition == #bottomRight]) ifTrue:[
"
label at right
"
- x := width - labelLen - font height
+ x := width - margin - labelLen - font height
] ifFalse:[
"
label at center
"
- x := (width - labelLen) // 2
+ x := (width - margin - labelLen) // 2
]
].
self paint:fgColor on:viewBackground.
@@ -716,5 +719,5 @@
!FramedBox class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/FramedBox.st,v 1.37 1998-06-06 18:05:20 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/FramedBox.st,v 1.38 1998-08-05 14:39:50 cg Exp $'
! !