allow valueHolders for the layout components.
--- a/AlignOrg.st Mon Sep 15 22:04:24 1997 +0200
+++ b/AlignOrg.st Mon Sep 15 22:16:05 1997 +0200
@@ -10,6 +10,8 @@
hereby transferred.
"
+'From Smalltalk/X, Version:3.1.10 on 13-sep-1997 at 10:54:44 pm' !
+
LayoutOrigin subclass:#AlignmentOrigin
instanceVariableNames:'leftAlignmentFraction topAlignmentFraction'
classVariableNames:''
@@ -273,24 +275,24 @@
leftOffset isNil ifTrue:[
x := 0
] ifFalse:[
- x := leftOffset
+ x := leftOffset value
].
topOffset isNil ifTrue:[
y := 0
] ifFalse:[
- y := topOffset
+ y := topOffset value
].
leftFraction notNil ifTrue:[
- x := x + (superRectangle width * leftFraction)
+ x := x + (superRectangle width * leftFraction value)
].
topFraction notNil ifTrue:[
- y := y + (superRectangle height * topFraction)
+ y := y + (superRectangle height * topFraction value)
].
leftAlignmentFraction ~~ 0 ifTrue:[
- x := x - (prefRect width * leftAlignmentFraction)
+ x := x - (prefRect width * leftAlignmentFraction value)
].
topAlignmentFraction ~~ 0 ifTrue:[
- y := y - (prefRect height * topAlignmentFraction)
+ y := y - (prefRect height * topAlignmentFraction value)
].
^ Rectangle left:x top:y extent:prefRect extent
@@ -306,11 +308,11 @@
aO rectangleRelativeTo:superRect preferred:(0@0 corner:30@30)
"
- "Modified: 8.5.1996 / 20:57:09 / cg"
+ "Modified: 13.9.1997 / 10:39:50 / cg"
! !
!AlignmentOrigin class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview2/Attic/AlignOrg.st,v 1.20 1997-04-18 18:11:06 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview2/Attic/AlignOrg.st,v 1.21 1997-09-15 20:16:04 cg Exp $'
! !
--- a/AlignmentOrigin.st Mon Sep 15 22:04:24 1997 +0200
+++ b/AlignmentOrigin.st Mon Sep 15 22:16:05 1997 +0200
@@ -10,6 +10,8 @@
hereby transferred.
"
+'From Smalltalk/X, Version:3.1.10 on 13-sep-1997 at 10:54:44 pm' !
+
LayoutOrigin subclass:#AlignmentOrigin
instanceVariableNames:'leftAlignmentFraction topAlignmentFraction'
classVariableNames:''
@@ -273,24 +275,24 @@
leftOffset isNil ifTrue:[
x := 0
] ifFalse:[
- x := leftOffset
+ x := leftOffset value
].
topOffset isNil ifTrue:[
y := 0
] ifFalse:[
- y := topOffset
+ y := topOffset value
].
leftFraction notNil ifTrue:[
- x := x + (superRectangle width * leftFraction)
+ x := x + (superRectangle width * leftFraction value)
].
topFraction notNil ifTrue:[
- y := y + (superRectangle height * topFraction)
+ y := y + (superRectangle height * topFraction value)
].
leftAlignmentFraction ~~ 0 ifTrue:[
- x := x - (prefRect width * leftAlignmentFraction)
+ x := x - (prefRect width * leftAlignmentFraction value)
].
topAlignmentFraction ~~ 0 ifTrue:[
- y := y - (prefRect height * topAlignmentFraction)
+ y := y - (prefRect height * topAlignmentFraction value)
].
^ Rectangle left:x top:y extent:prefRect extent
@@ -306,11 +308,11 @@
aO rectangleRelativeTo:superRect preferred:(0@0 corner:30@30)
"
- "Modified: 8.5.1996 / 20:57:09 / cg"
+ "Modified: 13.9.1997 / 10:39:50 / cg"
! !
!AlignmentOrigin class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview2/AlignmentOrigin.st,v 1.20 1997-04-18 18:11:06 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview2/AlignmentOrigin.st,v 1.21 1997-09-15 20:16:04 cg Exp $'
! !
--- a/LayoutFrame.st Mon Sep 15 22:04:24 1997 +0200
+++ b/LayoutFrame.st Mon Sep 15 22:16:05 1997 +0200
@@ -10,6 +10,8 @@
hereby transferred.
"
+'From Smalltalk/X, Version:3.1.10 on 13-sep-1997 at 10:54:29 pm' !
+
LayoutOrigin subclass:#LayoutFrame
instanceVariableNames:'rightFraction bottomFraction rightOffset bottomOffset'
classVariableNames:''
@@ -386,39 +388,39 @@
leftOffset isNil ifTrue:[
x1 := 0
] ifFalse:[
- x1 := leftOffset
+ x1 := leftOffset value
].
topOffset isNil ifTrue:[
y1 := 0
] ifFalse:[
- y1 := topOffset
+ y1 := topOffset value
].
rightOffset isNil ifTrue:[
x2 := 0
] ifFalse:[
- x2 := rightOffset
+ x2 := rightOffset value
].
bottomOffset isNil ifTrue:[
y2 := 0
] ifFalse:[
- y2 := bottomOffset
+ y2 := bottomOffset value
].
leftFraction notNil ifTrue:[
superWidth := superRectangle width.
- x1 := x1 + (superWidth * leftFraction)
+ x1 := x1 + (superWidth * leftFraction value)
].
topFraction notNil ifTrue:[
superHeight := superRectangle height.
- y1 := y1 + (superHeight * topFraction)
+ y1 := y1 + (superHeight * topFraction value)
].
rightFraction notNil ifTrue:[
superWidth isNil ifTrue:[superWidth := superRectangle width].
- x2 := x2 + (superWidth * rightFraction)
+ x2 := x2 + (superWidth * rightFraction value)
].
bottomFraction notNil ifTrue:[
superHeight isNil ifTrue:[superHeight := superRectangle height].
- y2 := y2 + (superHeight * bottomFraction)
+ y2 := y2 + (superHeight * bottomFraction value)
].
^ Rectangle left:x1 top:y1 right:x2 bottom:y2
@@ -435,11 +437,11 @@
"
"Created: 6.3.1997 / 21:07:51 / cg"
- "Modified: 6.3.1997 / 22:39:58 / cg"
+ "Modified: 13.9.1997 / 10:40:24 / cg"
! !
!LayoutFrame class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview2/LayoutFrame.st,v 1.21 1997-04-18 18:16:30 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview2/LayoutFrame.st,v 1.22 1997-09-15 20:16:05 cg Exp $'
! !
--- a/LayoutFrm.st Mon Sep 15 22:04:24 1997 +0200
+++ b/LayoutFrm.st Mon Sep 15 22:16:05 1997 +0200
@@ -10,6 +10,8 @@
hereby transferred.
"
+'From Smalltalk/X, Version:3.1.10 on 13-sep-1997 at 10:54:29 pm' !
+
LayoutOrigin subclass:#LayoutFrame
instanceVariableNames:'rightFraction bottomFraction rightOffset bottomOffset'
classVariableNames:''
@@ -386,39 +388,39 @@
leftOffset isNil ifTrue:[
x1 := 0
] ifFalse:[
- x1 := leftOffset
+ x1 := leftOffset value
].
topOffset isNil ifTrue:[
y1 := 0
] ifFalse:[
- y1 := topOffset
+ y1 := topOffset value
].
rightOffset isNil ifTrue:[
x2 := 0
] ifFalse:[
- x2 := rightOffset
+ x2 := rightOffset value
].
bottomOffset isNil ifTrue:[
y2 := 0
] ifFalse:[
- y2 := bottomOffset
+ y2 := bottomOffset value
].
leftFraction notNil ifTrue:[
superWidth := superRectangle width.
- x1 := x1 + (superWidth * leftFraction)
+ x1 := x1 + (superWidth * leftFraction value)
].
topFraction notNil ifTrue:[
superHeight := superRectangle height.
- y1 := y1 + (superHeight * topFraction)
+ y1 := y1 + (superHeight * topFraction value)
].
rightFraction notNil ifTrue:[
superWidth isNil ifTrue:[superWidth := superRectangle width].
- x2 := x2 + (superWidth * rightFraction)
+ x2 := x2 + (superWidth * rightFraction value)
].
bottomFraction notNil ifTrue:[
superHeight isNil ifTrue:[superHeight := superRectangle height].
- y2 := y2 + (superHeight * bottomFraction)
+ y2 := y2 + (superHeight * bottomFraction value)
].
^ Rectangle left:x1 top:y1 right:x2 bottom:y2
@@ -435,11 +437,11 @@
"
"Created: 6.3.1997 / 21:07:51 / cg"
- "Modified: 6.3.1997 / 22:39:58 / cg"
+ "Modified: 13.9.1997 / 10:40:24 / cg"
! !
!LayoutFrame class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview2/Attic/LayoutFrm.st,v 1.21 1997-04-18 18:16:30 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview2/Attic/LayoutFrm.st,v 1.22 1997-09-15 20:16:05 cg Exp $'
! !
--- a/LayoutOrg.st Mon Sep 15 22:04:24 1997 +0200
+++ b/LayoutOrg.st Mon Sep 15 22:16:05 1997 +0200
@@ -10,6 +10,8 @@
hereby transferred.
"
+'From Smalltalk/X, Version:3.1.10 on 13-sep-1997 at 10:54:16 pm' !
+
Layout subclass:#LayoutOrigin
instanceVariableNames:'leftFraction topFraction leftOffset topOffset'
classVariableNames:''
@@ -352,18 +354,18 @@
leftOffset isNil ifTrue:[
x := 0
] ifFalse:[
- x := leftOffset
+ x := leftOffset value
].
topOffset isNil ifTrue:[
y := 0
] ifFalse:[
- y := topOffset
+ y := topOffset value
].
leftFraction notNil ifTrue:[
- x := x + (superRectangle width * leftFraction)
+ x := x + (superRectangle width * leftFraction value)
].
topFraction notNil ifTrue:[
- y := y + (superRectangle height * topFraction)
+ y := y + (superRectangle height * topFraction value)
].
^ Rectangle left:x top:y extent:prefRect extent
@@ -377,11 +379,11 @@
lO rectangleRelativeTo:superRect preferred:(0@0 corner:30@30)
"
- "Modified: 8.5.1996 / 20:58:53 / cg"
+ "Modified: 13.9.1997 / 10:40:35 / cg"
! !
!LayoutOrigin class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview2/Attic/LayoutOrg.st,v 1.16 1997-04-18 18:10:47 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview2/Attic/LayoutOrg.st,v 1.17 1997-09-15 20:16:05 cg Exp $'
! !
--- a/LayoutOrigin.st Mon Sep 15 22:04:24 1997 +0200
+++ b/LayoutOrigin.st Mon Sep 15 22:16:05 1997 +0200
@@ -10,6 +10,8 @@
hereby transferred.
"
+'From Smalltalk/X, Version:3.1.10 on 13-sep-1997 at 10:54:16 pm' !
+
Layout subclass:#LayoutOrigin
instanceVariableNames:'leftFraction topFraction leftOffset topOffset'
classVariableNames:''
@@ -352,18 +354,18 @@
leftOffset isNil ifTrue:[
x := 0
] ifFalse:[
- x := leftOffset
+ x := leftOffset value
].
topOffset isNil ifTrue:[
y := 0
] ifFalse:[
- y := topOffset
+ y := topOffset value
].
leftFraction notNil ifTrue:[
- x := x + (superRectangle width * leftFraction)
+ x := x + (superRectangle width * leftFraction value)
].
topFraction notNil ifTrue:[
- y := y + (superRectangle height * topFraction)
+ y := y + (superRectangle height * topFraction value)
].
^ Rectangle left:x top:y extent:prefRect extent
@@ -377,11 +379,11 @@
lO rectangleRelativeTo:superRect preferred:(0@0 corner:30@30)
"
- "Modified: 8.5.1996 / 20:58:53 / cg"
+ "Modified: 13.9.1997 / 10:40:35 / cg"
! !
!LayoutOrigin class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview2/LayoutOrigin.st,v 1.16 1997-04-18 18:10:47 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview2/LayoutOrigin.st,v 1.17 1997-09-15 20:16:05 cg Exp $'
! !