@@ -70,6 +70,8 @@ _function(CGInsetMakeZero()) _function(CGInsetMakeCopy(anInset)) _function(CGInsetIsEmpty(anInset)) +CGRectNull = _CGRectMake(Infinity, Infinity, 0.0, 0.0); + /*! @addtogroup appkit @{ @@ -174,6 +176,15 @@ function CGRectStandardize(aRect) function CGRectUnion(lhsRect, rhsRect) { + var lhsRectIsNull = !lhsRect || lhsRect === CGRectNull, + rhsRectIsNull = !rhsRect || rhsRect === CGRectNull; + + if (lhsRectIsNull) + return rhsRectIsNull ? CGRectNull : rhsRect; + + if (rhsRectIsNull) + return lhsRectIsNull ? CGRectNull : lhsRect; + var minX = MIN(_CGRectGetMinX(lhsRect), _CGRectGetMinX(rhsRect)), minY = MIN(_CGRectGetMinY(lhsRect), _CGRectGetMinY(rhsRect)), maxX = MAX(_CGRectGetMaxX(lhsRect), _CGRectGetMaxX(rhsRect)), AppKit/CoreGraphics/CGGeometry.j 9e825ea62ed208026e1e30162e4c5f032446ce5f d8249b60353682398e549a37ac9930e7f107b59b Ross Boucher ross@280north.com http://github.com/cacaodev/cappuccino/commit/06eac3e79beafce33a4bf0d8ec9e4c13f0bbd415 06eac3e79beafce33a4bf0d8ec9e4c13f0bbd415 2009-10-26T23:20:29-07:00 2009-10-26T23:20:29-07:00 Merge branch 'master' of git@github.com:280north/cappuccino d0850d9341682929ce46b06c995b2540c9bbf803 Ross Boucher ross@280north.com