--- a/SimpleView.st Sat Mar 18 16:45:58 2017 +0100
+++ b/SimpleView.st Sat Mar 18 16:47:55 2017 +0100
@@ -7888,6 +7888,7 @@
self initializeMiddleButtonMenu.
"Modified: / 08-02-2017 / 00:26:52 / cg"
+ "Modified: / 18-03-2017 / 00:20:40 / stefan"
!
initializeMiddleButtonMenu
@@ -8610,7 +8611,14 @@
pixelExtent:extent
"set the view's extent in pixels"
- self pixelOrigin:(left @ top) extent:extent
+ |org|
+
+ (left notNil and:[top notNil]) ifTrue:[
+ org := left @ top.
+ ].
+ self pixelOrigin:org extent:extent.
+
+ "Modified: / 18-03-2017 / 00:24:50 / stefan"
!
pixelOrigin
@@ -8672,9 +8680,13 @@
mustRedrawBottomEdge mustRedrawRightEdge mustRepaintBottom
mustRepaintRight sameOrigin oldWidth oldHeight oldPaint|
- newLeft := origin x.
- newTop := origin y.
- sameOrigin := ((newTop == top) and:[newLeft == left]).
+ origin isNil ifTrue:[
+ sameOrigin := true.
+ ] ifFalse:[
+ newLeft := origin x.
+ newTop := origin y.
+ sameOrigin := (newTop == top) and:[newLeft == left].
+ ].
newWidth := extent x.
newHeight := extent y.
@@ -8841,7 +8853,8 @@
dependents notNil ifTrue:[ self changed:#origin ].
].
- "Modified: / 25.5.1999 / 14:49:56 / cg"
+ "Modified: / 25-05-1999 / 14:49:56 / cg"
+ "Modified: / 18-03-2017 / 00:28:57 / stefan"
!
pointFromRelative:p
@@ -9668,25 +9681,25 @@
slowly migrating to use layoutObjects ...
"
layout notNil ifTrue:[
- 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.
+ 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 ..."
@@ -9698,23 +9711,26 @@
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:[
- device 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:[
+ device moveWindow:self drawableId x:left y:top.
+ ] ifFalse:[
+ (left notNil and:[top notNil]) ifTrue:[
+ self pixelOrigin:left@top.
+ ].
+ ].
+ ].
+ ].
+ self originChangedFlag:false
]
- "Modified: 18.6.1996 / 21:44:03 / cg"
+ "Modified: / 18-06-1996 / 21:44:03 / cg"
+ "Modified: / 18-03-2017 / 00:32:44 / stefan"
!
forceResize
@@ -9827,7 +9843,7 @@
iconified ifTrue:[
device
mapView:self id:self drawableId iconified:iconified
- atX:0 y:0
+ atX:nil y:nil
width:width height:height
minExtent:(self minExtent) maxExtent:(self maxExtent).
] ifFalse:[
@@ -9863,9 +9879,8 @@
].
]
- "Modified: 23.8.1996 / 14:53:55 / stefan"
- "Created: 24.7.1997 / 13:43:23 / cg"
- "Modified: 24.7.1997 / 13:46:21 / cg"
+ "Created: / 24-07-1997 / 13:43:23 / cg"
+ "Modified: / 18-03-2017 / 00:07:24 / stefan"
!
mapIconified