prefRect may now be a valueHolder or block
(in #rectangleRelativeTo:preferredBounds:).
--- a/Layout.st Wed May 27 11:20:52 1998 +0200
+++ b/Layout.st Wed May 27 11:21:38 1998 +0200
@@ -132,18 +132,18 @@
!
-rectangleRelativeTo:superRectangle preferred:prefRect
+rectangleRelativeTo:superRectangle preferred:prefRectHolder
"compute the rectangle represented by the receiver,
given the superViews rectangle and the views preferredExtent.
Must be implemented by concrete subclasses."
^ self subclassResponsibility
- "Modified: 27.4.1996 / 14:46:37 / cg"
+ "Modified: / 27.5.1998 / 10:19:21 / cg"
! !
!Layout class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview2/Layout.st,v 1.15 1998-01-28 16:42:48 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview2/Layout.st,v 1.16 1998-05-27 09:21:20 cg Exp $'
! !
--- a/LayoutFrame.st Wed May 27 11:20:52 1998 +0200
+++ b/LayoutFrame.st Wed May 27 11:21:38 1998 +0200
@@ -10,8 +10,6 @@
hereby transferred.
"
-'From Smalltalk/X, Version:3.1.10 on 20-sep-1997 at 12:00:17 am' !
-
LayoutOrigin subclass:#LayoutFrame
instanceVariableNames:'rightFraction bottomFraction rightOffset bottomOffset'
classVariableNames:''
@@ -383,7 +381,7 @@
!
-rectangleRelativeTo:superRectangle preferred:prefRect
+rectangleRelativeTo:superRectangle preferred:prefRectHolder
"compute the rectangle represented by the receiver,
given the superViews rectangle and the views preferredExtent."
@@ -440,12 +438,12 @@
lF rectangleRelativeTo:superRect preferred:(0@0 corner:30@30)
"
- "Created: 6.3.1997 / 21:07:51 / cg"
- "Modified: 13.9.1997 / 10:40:24 / cg"
+ "Created: / 6.3.1997 / 21:07:51 / cg"
+ "Modified: / 27.5.1998 / 10:19:18 / cg"
! !
!LayoutFrame class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview2/LayoutFrame.st,v 1.23 1997-09-20 22:19:44 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview2/LayoutFrame.st,v 1.24 1998-05-27 09:21:30 cg Exp $'
! !
--- a/LayoutFrm.st Wed May 27 11:20:52 1998 +0200
+++ b/LayoutFrm.st Wed May 27 11:21:38 1998 +0200
@@ -10,8 +10,6 @@
hereby transferred.
"
-'From Smalltalk/X, Version:3.1.10 on 20-sep-1997 at 12:00:17 am' !
-
LayoutOrigin subclass:#LayoutFrame
instanceVariableNames:'rightFraction bottomFraction rightOffset bottomOffset'
classVariableNames:''
@@ -383,7 +381,7 @@
!
-rectangleRelativeTo:superRectangle preferred:prefRect
+rectangleRelativeTo:superRectangle preferred:prefRectHolder
"compute the rectangle represented by the receiver,
given the superViews rectangle and the views preferredExtent."
@@ -440,12 +438,12 @@
lF rectangleRelativeTo:superRect preferred:(0@0 corner:30@30)
"
- "Created: 6.3.1997 / 21:07:51 / cg"
- "Modified: 13.9.1997 / 10:40:24 / cg"
+ "Created: / 6.3.1997 / 21:07:51 / cg"
+ "Modified: / 27.5.1998 / 10:19:18 / cg"
! !
!LayoutFrame class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview2/Attic/LayoutFrm.st,v 1.23 1997-09-20 22:19:44 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview2/Attic/LayoutFrm.st,v 1.24 1998-05-27 09:21:30 cg Exp $'
! !
--- a/LayoutOrg.st Wed May 27 11:20:52 1998 +0200
+++ b/LayoutOrg.st Wed May 27 11:21:38 1998 +0200
@@ -10,8 +10,6 @@
hereby transferred.
"
-'From Smalltalk/X, Version:3.1.10 on 20-sep-1997 at 11:59:21 pm' !
-
Layout subclass:#LayoutOrigin
instanceVariableNames:'leftFraction topFraction leftOffset topOffset'
classVariableNames:''
@@ -349,11 +347,13 @@
^ leftFraction asFloat @ topFraction asFloat
!
-rectangleRelativeTo:superRectangle preferred:prefRect
+rectangleRelativeTo:superRectangle preferred:prefRectHolder
"compute the rectangle represented by the receiver,
given the superViews rectangle and the views preferredExtent."
- |x y|
+ |x y prefRect|
+
+ prefRect := prefRectHolder value.
leftOffset isNil ifTrue:[
x := 0
@@ -383,11 +383,11 @@
lO rectangleRelativeTo:superRect preferred:(0@0 corner:30@30)
"
- "Modified: 13.9.1997 / 10:40:35 / cg"
+ "Modified: / 27.5.1998 / 10:19:58 / cg"
! !
!LayoutOrigin class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview2/Attic/LayoutOrg.st,v 1.18 1997-09-20 22:19:45 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview2/Attic/LayoutOrg.st,v 1.19 1998-05-27 09:21:38 cg Exp $'
! !
--- a/LayoutOrigin.st Wed May 27 11:20:52 1998 +0200
+++ b/LayoutOrigin.st Wed May 27 11:21:38 1998 +0200
@@ -10,8 +10,6 @@
hereby transferred.
"
-'From Smalltalk/X, Version:3.1.10 on 20-sep-1997 at 11:59:21 pm' !
-
Layout subclass:#LayoutOrigin
instanceVariableNames:'leftFraction topFraction leftOffset topOffset'
classVariableNames:''
@@ -349,11 +347,13 @@
^ leftFraction asFloat @ topFraction asFloat
!
-rectangleRelativeTo:superRectangle preferred:prefRect
+rectangleRelativeTo:superRectangle preferred:prefRectHolder
"compute the rectangle represented by the receiver,
given the superViews rectangle and the views preferredExtent."
- |x y|
+ |x y prefRect|
+
+ prefRect := prefRectHolder value.
leftOffset isNil ifTrue:[
x := 0
@@ -383,11 +383,11 @@
lO rectangleRelativeTo:superRect preferred:(0@0 corner:30@30)
"
- "Modified: 13.9.1997 / 10:40:35 / cg"
+ "Modified: / 27.5.1998 / 10:19:58 / cg"
! !
!LayoutOrigin class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview2/LayoutOrigin.st,v 1.18 1997-09-20 22:19:45 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview2/LayoutOrigin.st,v 1.19 1998-05-27 09:21:38 cg Exp $'
! !