--- a/SimpleView.st Thu Jan 28 15:02:25 2016 +0000
+++ b/SimpleView.st Fri Jan 29 08:32:08 2016 +0000
@@ -5929,16 +5929,23 @@
slowly migrating to use layoutObjects ...
"
layout isNil ifTrue:[
- newOrg := self computeOrigin.
- newExt := self computeExtent.
+ newOrg := self computeOrigin.
+ newExt := self computeExtent.
+ ] ifFalse:[layout isAssociation ifTrue:[
+ layout key == #extent ifTrue:[
+ newOrg := 1@1.
+ newExt := layout value.
+ ] ifFalse:[
+ self shouldImplement.
+ ].
] ifFalse:[
- r := (layout rectangleRelativeTo:(superView viewRectangle)
- preferred:[self preferredBounds]).
- newOrg := r origin rounded.
- newExt := r extent rounded.
-"/ newOrg printNL.
-"/ newExt printNL.
- ].
+ r := (layout rectangleRelativeTo:(superView viewRectangle)
+ preferred:[self preferredBounds]).
+ newOrg := r origin rounded.
+ newExt := r extent rounded.
+"/ newOrg printCR.
+"/ newExt printCR.
+ ]].
"/ newOrg notNil ifTrue:[
"/ ((newOrg x == oldLeft) and:[newOrg y == oldTop]) ifTrue:[
@@ -9531,16 +9538,25 @@
slowly migrating to use layoutObjects ...
"
layout notNil ifTrue:[
- superView notNil ifTrue:[
- (self originOrExtentOrCornerChanged) ifTrue:[
- r := (layout rectangleRelativeTo:(superView viewRectangle)
- preferred:[self preferredBounds]).
- org := r origin rounded.
- ext := r extent rounded.
- self pixelOrigin:org extent:ext.
- ].
- ].
- ^ self.
+ superView notNil ifTrue:[
+ (self originOrExtentOrCornerChanged) ifTrue:[
+ layout isAssociation ifTrue:[
+ layout key == #extent ifTrue:[
+ org := 1@1.
+ ext := layout value.
+ ] ifFalse:[
+ self shouldImplement.
+ ].
+ ] ifFalse:[
+ r := (layout rectangleRelativeTo:(superView viewRectangle)
+ preferred:[self preferredBounds]).
+ org := r origin rounded.
+ ext := r extent rounded.
+ ].
+ self pixelOrigin:org extent:ext.
+ ].
+ ].
+ ^ self.
].
"if the extent is not the one we created the window with ..."
@@ -9552,20 +9568,20 @@
self originChangedFlag ifTrue:[
"/ org := self computeOrigin.
"/ self pixelOrigin:org.
- originRule notNil ifTrue:[
- self pixelOrigin:self computeOrigin
- ] ifFalse:[
- relativeOrigin notNil ifTrue:[
- self originFromRelativeOrigin:relativeOrigin
- ] ifFalse:[
- shown ifTrue:[
- self graphicsDevice moveWindow:self drawableId x:left y:top.
- ] ifFalse:[
- self pixelOrigin:left@top
- ].
- ].
- ].
- self originChangedFlag:false
+ originRule notNil ifTrue:[
+ self pixelOrigin:self computeOrigin
+ ] ifFalse:[
+ relativeOrigin notNil ifTrue:[
+ self originFromRelativeOrigin:relativeOrigin
+ ] ifFalse:[
+ shown ifTrue:[
+ self graphicsDevice moveWindow:self drawableId x:left y:top.
+ ] ifFalse:[
+ self pixelOrigin:left@top
+ ].
+ ].
+ ].
+ self originChangedFlag:false
]
"Modified: 18.6.1996 / 21:44:03 / cg"