--- a/SimpleView.st Fri Apr 19 12:45:59 1996 +0200
+++ b/SimpleView.st Fri Apr 19 15:17:54 1996 +0200
@@ -1670,10 +1670,10 @@
extent:extent
"set the views extent;
extent may be:
- a point
- where integer fields mean 'pixel-values'
- and float values mean 'relative-to-superview'
- and nil means 'leave current value';
+ a point
+ where integer fields mean 'pixel-values'
+ and float values mean 'relative-to-superview'
+ and nil means 'leave current value';
or a block returning a point which is interpreted as above.
Be careful when using relative extents: rounding errors may
accumulate. Better use origin/corner.
@@ -1682,31 +1682,34 @@
|w h pixelExtent e|
extent isBlock ifTrue:[
- extentRule := extent.
- drawableId notNil ifTrue:[
- pixelExtent := extent value
- ] ifFalse:[
- extentChanged := true
- ]
+ extentRule := extent.
+ drawableId notNil ifTrue:[
+ pixelExtent := extent value
+ ] ifFalse:[
+ extentChanged := true
+ ]
] ifFalse:[
- w := extent x.
- h := extent y.
- w isNil ifTrue:[w := width].
- h isNil ifTrue:[h := height].
- e := w@h.
- ((w isInteger not) or:[h isInteger not]) ifTrue:[
- relativeExtent := e.
- pixelExtent := self extentFromRelativeExtent.
- pixelExtent isNil ifTrue:[
- extentChanged := true
- ]
- ] ifFalse:[
- pixelExtent := e
- ]
+ w := extent x.
+ h := extent y.
+ w isNil ifTrue:[w := width].
+ h isNil ifTrue:[h := height].
+ e := w@h.
+ ((w isInteger not) or:[h isInteger not]) ifTrue:[
+ relativeExtent := e.
+ pixelExtent := self extentFromRelativeExtent.
+ pixelExtent isNil ifTrue:[
+ extentChanged := true
+ ]
+ ] ifFalse:[
+ relativeExtent := nil.
+ pixelExtent := e
+ ]
].
pixelExtent notNil ifTrue:[
- self pixelExtent:pixelExtent
+ self pixelExtent:pixelExtent
]
+
+ "Modified: 19.4.1996 / 15:11:15 / cg"
!
geometryLayout
@@ -1918,42 +1921,45 @@
origin:origin
"set the views origin;
origin may be:
- a point
- where integer fields mean 'pixel-values'
- and float values mean 'relative-to-superview'
- and nil means 'take current value';
+ a point
+ where integer fields mean 'pixel-values'
+ and float values mean 'relative-to-superview'
+ and nil means 'take current value';
or a block returning a point which is interpreted as above.
Please migrate to use layout objects."
|newLeft newTop pixelOrigin o|
origin isBlock ifTrue:[
- originRule := origin.
- drawableId notNil ifTrue:[
- pixelOrigin := origin value
- ] ifFalse:[
- originChanged := true
- ]
+ originRule := origin.
+ drawableId notNil ifTrue:[
+ pixelOrigin := origin value
+ ] ifFalse:[
+ originChanged := true
+ ]
] ifFalse:[
- o := origin.
- newLeft := origin x.
- newTop := origin y.
- newLeft isNil ifTrue:[newLeft := left].
- newTop isNil ifTrue:[newTop := top].
- o := newLeft @ newTop.
- ((newLeft isInteger not) or:[newTop isInteger not]) ifTrue:[
- relativeOrigin := o.
- pixelOrigin := self originFromRelativeOrigin.
- pixelOrigin isNil ifTrue:[
- originChanged := true
- ]
- ] ifFalse:[
- pixelOrigin := o
- ]
+ o := origin.
+ newLeft := origin x.
+ newTop := origin y.
+ newLeft isNil ifTrue:[newLeft := left].
+ newTop isNil ifTrue:[newTop := top].
+ o := newLeft @ newTop.
+ ((newLeft isInteger not) or:[newTop isInteger not]) ifTrue:[
+ relativeOrigin := o.
+ pixelOrigin := self originFromRelativeOrigin.
+ pixelOrigin isNil ifTrue:[
+ originChanged := true
+ ]
+ ] ifFalse:[
+ relativeOrigin := nil.
+ pixelOrigin := o
+ ]
].
pixelOrigin notNil ifTrue:[
- self pixelOrigin:pixelOrigin
+ self pixelOrigin:pixelOrigin
].
+
+ "Modified: 19.4.1996 / 15:12:36 / cg"
!
origin:origin corner:corner
@@ -6171,6 +6177,6 @@
!SimpleView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/SimpleView.st,v 1.75 1996-04-13 22:20:35 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/SimpleView.st,v 1.76 1996-04-19 13:17:54 cg Exp $'
! !
SimpleView initialize!