From: <kr_...@us...> - 2003-08-23 18:04:00
|
Update of /cvsroot/htoolkit/port/src/Port In directory sc8-pr-cvs1:/tmp/cvs-serv27090/port/src/Port Modified Files: Types.hs Log Message: addSize primitive Index: Types.hs =================================================================== RCS file: /cvsroot/htoolkit/port/src/Port/Types.hs,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** Types.hs 23 Aug 2003 16:11:44 -0000 1.30 --- Types.hs 23 Aug 2003 18:03:57 -0000 1.31 *************** *** 22,26 **** -- ** Sizes ! , Size(..), sz, sizeEncloses, maxSize, addh, addv, sizeDistance -- ** Rectangles --- 22,26 ---- -- ** Sizes ! , Size(..), sz, sizeEncloses, maxSize, addh, addv, addSize, sizeDistance -- ** Rectangles *************** *** 230,233 **** --- 230,236 ---- addv :: Size -> Size -> Size addv (Size w1 h1) (Size w2 h2) = Size (max w1 w2) (h1+h2) + + addSize :: Size -> Size -> Size + addSize (Size w1 h1) (Size w2 h2) = Size (w1+w2) (h1+h2) sizeDistance :: Point -> Point -> Size |