hg/stx-libbasic: comparison Rectangle.st

equal deleted inserted replaced

-:3f803938a75c
+:85e585250a3c
+"{ Encoding: utf8 }"
 "
 COPYRIGHT (c) 1989 by Claus Gittinger
 	      All Rights Reserved
 This software is furnished under a license and may be used
 corner
 "return the corner"
 %{  /* NOCONTEXT */
-if (self == @global(Rectangle)) {
+if (__qClass(self) == @global(Rectangle)) {
-	OBJ _tleft = __INST(left);
+OBJ _tleft = __INST(left);
-	OBJ _ttop = __INST(top);
+OBJ _ttop = __INST(top);
-	OBJ _twidth = __INST(width);
+OBJ _twidth = __INST(width);
-	OBJ _theight = __INST(height);
+OBJ _theight = __INST(height);
-	if (__bothSmallInteger(_tleft, _ttop)
+if (__bothSmallInteger(_tleft, _ttop)
-	 && __bothSmallInteger(_twidth, _theight)) {
+&& __bothSmallInteger(_twidth, _theight)) {
-	    if (__CanDoQuickNew(sizeof(struct __Point))) {      /* OBJECT ALLOCATION */
+if (__CanDoQuickNew(sizeof(struct __Point))) {      /* OBJECT ALLOCATION */
-		OBJ newPoint;
+OBJ newPoint;
-		int spc;
+int spc;
-		int cX = __intVal(_tleft) + __intVal(_twidth);
+int cX = __intVal(_tleft) + __intVal(_twidth);
-		int cY = __intVal(_ttop) + __intVal(_theight);
+int cY = __intVal(_ttop) + __intVal(_theight);
-		if (__ISVALIDINTEGER(cX) && __ISVALIDINTEGER(cY)) {
+if (__ISVALIDINTEGER(cX) && __ISVALIDINTEGER(cY)) {
-		    __qCheckedNew(newPoint, sizeof(struct __Point));
+__qCheckedNew(newPoint, sizeof(struct __Point));
-		    __InstPtr(newPoint)->o_class = self; __qSTORE(newPoint, self);
+__InstPtr(newPoint)->o_class = @global(Point); __qSTORE(newPoint, @global(Point));
-		    __PointInstPtr(newPoint)->p_x = __MKSMALLINT(cX);
+__PointInstPtr(newPoint)->p_x = __MKSMALLINT(cX);
-		    __PointInstPtr(newPoint)->p_y = __MKSMALLINT(cY);
+__PointInstPtr(newPoint)->p_y = __MKSMALLINT(cY);
-		    RETURN ( newPoint );
+RETURN ( newPoint );
-		}
+}
-	    }
+}
-	}
+}
 }
 %}.
 ^ (left + width) @ (top + height)
+"
+(self origin:0@0 corner:100@100)   corner
+(self origin:0@0 corner:100@100)   origin
+(self origin:5@5 corner:100@100)   extent
+"
 !
 corner:aPoint
 "set the bottom-right corner - warning: destructive"
 "return the extent"
 %{  /* NOCONTEXT */
 if (__CanDoQuickNew(sizeof(struct __Point))) {      /* OBJECT ALLOCATION */
-	if (self == @global(Rectangle)) {
+if (__qClass(self) == @global(Rectangle)) {
-	    OBJ newPoint;
+OBJ newPoint;
-	    int spc;
+int spc;
-	    OBJ newX = __INST(width);
+OBJ newX = __INST(width);
-	    OBJ newY = __INST(height);
+OBJ newY = __INST(height);
-	    __qCheckedNew(newPoint, sizeof(struct __Point));
+__qCheckedNew(newPoint, sizeof(struct __Point));
-	    __InstPtr(newPoint)->o_class = self; __qSTORE(newPoint, self);
+__InstPtr(newPoint)->o_class = @global(Point); __qSTORE(newPoint, @global(Point));
-	    __PointInstPtr(newPoint)->p_x = newX;
+__PointInstPtr(newPoint)->p_x = newX;
-	    __PointInstPtr(newPoint)->p_y = newY;
+__PointInstPtr(newPoint)->p_y = newY;
-	    if (! __bothSmallInteger(newX, newY)) {
+if (! __bothSmallInteger(newX, newY)) {
-		spc = __qSpace(newPoint);
+spc = __qSpace(newPoint);
-		__STORE_SPC(newPoint, newX, spc);
+__STORE_SPC(newPoint, newX, spc);
-		__STORE_SPC(newPoint, newY, spc);
+__STORE_SPC(newPoint, newY, spc);
-	    }
+}
-	    RETURN ( newPoint );
+RETURN ( newPoint );
-	}
+}
 }
 %}.
 ^ Point x:width y:height
 !
 /*
 * claus: I am no longer certain, if this primitive is worth the effort
 */
 if (__CanDoQuickNew(sizeof(struct __Point))) {      /* OBJECT ALLOCATION */
-	if (self == @global(Rectangle)) {
+if (__qClass(self) == @global(Rectangle)) {
-	    OBJ newPoint;
+OBJ newPoint;
-	    int spc;
+int spc;
-	    OBJ newX = __INST(left);
+OBJ newX = __INST(left);
-	    OBJ newY = __INST(top);
+OBJ newY = __INST(top);
-	    __qCheckedNew(newPoint, sizeof(struct __Point));
+__qCheckedNew(newPoint, sizeof(struct __Point));
-	    __InstPtr(newPoint)->o_class = self; __qSTORE(newPoint, self);
+__InstPtr(newPoint)->o_class = @global(Point); __qSTORE(newPoint, @global(Point));
-	    __PointInstPtr(newPoint)->p_x = newX;
+__PointInstPtr(newPoint)->p_x = newX;
-	    __PointInstPtr(newPoint)->p_y = newY;
+__PointInstPtr(newPoint)->p_y = newY;
-	    if (! __bothSmallInteger(newX, newY)) {
+if (! __bothSmallInteger(newX, newY)) {
-		spc = __qSpace(newPoint);
+spc = __qSpace(newPoint);
-		__STORE_SPC(newPoint, newX, spc);
+__STORE_SPC(newPoint, newX, spc);
-		__STORE_SPC(newPoint, newY, spc);
+__STORE_SPC(newPoint, newY, spc);
-	    }
+}
-	    RETURN ( newPoint );
+RETURN ( newPoint );
-	}
+}
 }
 %}.
 ^ Point x:left y:top
 !
 topLeft:aPoint
 "Set the top and left edges.
 The bottom right remains unchanged.
 warning: destructive"
+|newTop newLeft|
+newTop := aPoint y.
+height := height + (top - newTop).
+top := newTop.
+newLeft := aPoint x.
+width := width + (left - newLeft).
+left := newLeft.
+"
+((self origin:0@0 corner:100@100) topLeft:(10@20))
+corner
+"
+!
+topRight
+"return the top-right point"
+^ (left + width) @ top
+!
+topRight:aPoint
+"Set the top and right edges.
+The bottom left remains unchanged.
+warning: destructive"
 |newTop|
 newTop := aPoint y.
 height := height + (top - newTop).
 top := newTop.
 width := aPoint x - left
-!
+"
-topRight
+((self origin:0@0 corner:100@100) topRight:(10@20))
-"return the top-right point"
+corner
+"
-^ (left + width) @ top
-!
-topRight:aPoint
-"Set the top and right edges.
-The bottom left remains unchanged.
-warning: destructive"
-|newTop|
-newTop := aPoint y.
-height := height + (top - newTop).
-top := newTop.
-width := aPoint x - left
 !
 vertices
 "return the array containing my points as a closed polygon (for Polygon compatibility)"
 asFractionalLayout
 "return a layoutFrame in which fractions (top, left, bottom, right)
 are taken from corresponding edges of the receiver.
 You have to make certain that those are in 0..1."
-|l|
+^ LayoutFrame new
-l := LayoutFrame new.
-l
 leftFraction:(self left);
 rightFraction:(self right);
 topFraction:(self top);
-bottomFraction:(self bottom).
+bottomFraction:(self bottom);
-^ l
+yourself.
 "
 (0.5@0.5 corner:0.75@0.75) asFractionalLayout
 (0.5@0.5 corner:0.75@0.75) asOffsetLayout
 (0.5@0.5 corner:0.75@0.75) asLayout
 asOffsetLayout
 "return a layoutFrame in which offsets (top, left, bottom, right)
 are taken from corresponding edges of the receiver.
 You have to make certain that those are in 0..1."
-|newLayout|
+^ LayoutFrame new
+leftOffset:(self left);
-newLayout := LayoutFrame new.
+rightFraction:0 offset:(self right);
-newLayout
+topOffset:(self top);
-	leftOffset:(self left);
+bottomFraction:0 offset:(self bottom);
-	rightFraction:0 offset:(self right);
+yourself.
-	topOffset:(self top);
-	bottomFraction:0 offset:(self bottom).
-^ newLayout
 "
 (0.5@0.5 corner:0.75@0.75) asFractionalLayout
 (0.5@0.5 corner:0.75@0.75) asOffsetLayout
 (0.5@0.5 corner:0.75@0.75) asLayout
 (10@10 corner:20@20) asFractionalLayout
 (10@10 corner:20@20) asOffsetLayout
 (10@10 corner:20@20) asLayout
 "
 !
 asPointArray
 "return an array containing my corners (clockwise) and
 the origin again as 5th element. Can be used to convert
 "
 (10@10 corner:100@100) asPolygon
 "
 "Modified: 8.5.1996 / 20:14:44 / cg"
+!
+asRectangle
+^ self
 !
 fromLiteralArrayEncoding:encoding
 "read my values from an encoding.
 The encoding is supposed to be of the form: (Rectangle orgX orgY cornX cornY)"
 "Modified (comment): / 27-11-2017 / 10:43:12 / cg"
 ! !
 !Rectangle methodsFor:'displaying'!
+ascentOn:aGC
+"displayOn: does draw above baseline"
+^ aGC fontAscent
+!
 displayFilledOn:aGC
 "display a filled rectangle as represented by the receiver in
 the graphicsContext, aGC"
 |amountPoint|
 (aPoint isMemberOf:SmallInteger) ifTrue:[
 "/ this is an stc optimization (isMemberOf:SmallInteger is a hint to inline addition!!)
-^ Rectangle
+^ self class
 left:(left - aPoint)
 top:(top - aPoint)
 width:width
 height:height
 ].
 !
 encompass:aPoint
 "return a Rectangle that contains both the receiver and aPoint."
-^ Rectangle
+^ self class
-	origin: (self origin min: aPoint)
+origin: (self origin min: aPoint)
-	corner: (self corner max: aPoint)
+corner: (self corner max: aPoint)
 !
 expandedBy:delta
 "return a new rectangle which is expanded in all directions
 by amount, a Point, Rectangle or Number"
 deltaWidth := deltaLeft * 2.
 deltaHeight := deltaTop * 2.
 ]
 ].
-^ Rectangle
+^ self class
 left:(left + deltaLeft) top:(top + deltaTop)
 width:(width - deltaWidth) height:(height - deltaHeight)
 "
 |r|
 insetOriginBy:originDelta cornerBy:cornerDelta
 "return a new rectangle which is inset by originDelta
 and cornerDelta; both may be instances of Point or Number"
-^ Rectangle
+^ self class
-	origin:(left @ top) + originDelta asPoint
+origin:(left @ top) + originDelta asPoint
-	corner:(self corner - cornerDelta asPoint)
+corner:(self corner - cornerDelta asPoint)
 "
 |r|
 r := Rectangle origin:10@10 corner:100@100.
 r insetOriginBy:5 cornerBy:10.
 r insetOriginBy:10@5 cornerBy:10.
 intersect:aRectangle
 "return a new rectangle covering the intersection of the receiver
 and the argument, aRectangle (i.e. the area covered by both).
 the rectangles must intersect for a valid return"
-^ Rectangle
+^ self class
 left:(left max:(aRectangle left))
 right:((left + width) min:(aRectangle right))
 top:(top max:(aRectangle top))
 bottom:((top + height) min:(aRectangle bottom))
 merge:aRectangle
 "return a new rectangle covering both the receiver
 and the argument, aRectangle"
-^ Rectangle
+^ self class
 left:(left min:(aRectangle left))
 right:((left + width) max:(aRectangle right))
 top:(top min:(aRectangle top))
 bottom:((top + height) max:(aRectangle bottom))
 rTop < minY ifTrue: [useRcvr := false. minY := rTop].
 maxY := self bottom.
 rBottom > maxY ifTrue: [useRcvr := false. maxY := rBottom].
 useRcvr ifTrue: [
-	^ self
+^ self
 ].
 minX = rLeft ifTrue:[
-	maxX = rRight ifTrue:[
+maxX = rRight ifTrue:[
-	    minY = rTop ifTrue:[
+minY = rTop ifTrue:[
-		maxY = rBottom ifTrue:[
+maxY = rBottom ifTrue:[
-		    ^ aRectangle
+^ aRectangle
-		].
+].
-	    ].
+].
-	].
+].
 ].
-^ Rectangle left:minX top:minY right:maxX bottom:maxY.
+^ self class left:minX top:minY right:maxX bottom:maxY.
 "
 (Rectangle origin:10@10 corner:100@100)
-	 quickMerge:(Rectangle origin:20@20 corner:110@110)
+quickMerge:(Rectangle origin:20@20 corner:110@110)
 (Rectangle origin:10@10 corner:100@100)
-	 quickMerge:(Rectangle origin:20@20 corner:100@100)
+quickMerge:(Rectangle origin:20@20 corner:100@100)
 "
 !
 scaledBy:scale
 "return a new rectangle which is the receiver
 |scalePoint sx sy|
 (scale isMemberOf:SmallInteger) ifTrue:[
 "/ this is an stc optimization (a hint to inline)
-^ Rectangle
+^ self class
 left:(left * scale) top:(top * scale)
 width:(width * scale) height:(height * scale)
 ].
 scalePoint := scale asPoint.
 sx := scalePoint x.
 sy := scalePoint y.
-^ Rectangle
+^ self class
 left:(left * sx) top:(top * sy)
 width:(width * sx) height:(height * sy)
 "
 (Rectangle origin:10@10 corner:50@50) scaledBy:2
 "
 x := x + translationPoint x.
 y := y + translationPoint y.
 ].
 ].
-^ Rectangle left:x top:y width:w height:h.
+^ self class left:x top:y width:w height:h.
 "
 (Rectangle origin:10@10 corner:50@50) scaledBy:2 translatedBy:10
 "
 |amountPoint|
 (amount isMemberOf:SmallInteger) ifTrue:[
 "/ this is an stc optimization (a hint to inline)
-^ Rectangle
+^ self class
 left:(left + amount) top:(top + amount)
 width:width height:height
 ].
 amountPoint := amount asPoint.
-^ Rectangle
+^ self class
 left:(left + amountPoint x) top:(top + amountPoint y)
 width:width height:height
 "
 (Rectangle origin:10@10 corner:50@50) translatedBy:10
 "
 align:offset with:someCoordinate
 "return a new rectangle which is translated (i.e. moved)
 such that the point offset in mySelf is placed on someCoordinate."
-^ Rectangle origin:(someCoordinate - offset + self origin)
+^ self class origin:(someCoordinate - offset + self origin)
-		extent:(self extent)
+extent:(self extent)
 "
 |r|
 r := Rectangle origin:10@10 corner:50@50.
 r align:(r center) with:100@100.
 (left isInteger
 and:[top isInteger
 and:[width isInteger
 and:[height isInteger]]])
-	ifTrue: [^ self].
+ifTrue: [^ self].
-^ Rectangle left:(left rounded)
+^ self class left:(left rounded)
-		 top:(top rounded)
+top:(top rounded)
-	       width:(width rounded)
+width:(width rounded)
-	      height:(height rounded)
+height:(height rounded)
 !
 truncated
 "return a Rectangle whose origin and corner have any fractional parts removed.
 Return the receiver if its coordinates are already integral."
 (left isInteger
 and:[top isInteger
 and:[width isInteger
 and:[height isInteger]]])
-	ifTrue: [^ self].
+ifTrue: [^ self].
-^ Rectangle
+^ self class
-	left:left truncated
+left:left truncated
-	top:top truncated
+top:top truncated
-	width:width truncated
+width:width truncated
-	height:height truncated.
+height:height truncated.
 ! !
 !Rectangle class methodsFor:'documentation'!
 version

changeset 23156	85e585250a3c
parent 22378	0f034b43ac9b
child 23196	f87041e0acc3