Permalink
Browse files

Merge pull request #40 from bomberstudios/patch-1

Fix a bug with Frame.merge size calculations
  • Loading branch information...
koenbok committed Sep 13, 2013
2 parents 3f01dfe + b3bef70 commit e4ed1d8daeb8cba7fbcca60f018911d77ca870b5
Showing with 4 additions and 3 deletions.
  1. +4 −3 src/primitives/frame.coffee
@@ -69,8 +69,9 @@ class Frame extends EventEmitter
frame =
x: Math.min(r1.x, r2.x)
y: Math.min(r1.y, r2.y)
width: Math.max(r1.width, r2.width)
height: Math.max(r1.height, r2.height)
width: Math.max(r1.width, (r2.x - r1.x) + r2.width),
height: Math.max(r1.height, (r2.y - r1.y) + r2.height)
return new Frame frame
Frame.Properties =
@@ -88,4 +89,4 @@ Frame.CalculatedProperties =
midY: null
maxY: null
exports.Frame = Frame
exports.Frame = Frame

0 comments on commit e4ed1d8

Please sign in to comment.