Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4492 from zhiqiangxu/develop 

closed #3407: an obvious bug in CCControlUtils::CCRectUnion.
This commit is contained in:
James Chen 2013-12-16 01:44:59 -08:00
parent d2ded2d780 f797dea827
commit 7deb3810c4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/GUI/CCControlExtension/CCControlUtils.cpp
View File

@ -163,7 +163,7 @@ Rect ControlUtils::RectUnion(const Rect& src1, const Rect& src2)
float x2 = MAX(src1.getMaxX(), src2.getMaxX()); float x2 = MAX(src1.getMaxX(), src2.getMaxX());
float y2 = MAX(src1.getMaxY(), src2.getMaxY()); float y2 = MAX(src1.getMaxY(), src2.getMaxY());
result.origin=Point(x1,x2); result.origin=Point(x1,y1);
result.size=Size(x2-x1, y2-y1); result.size=Size(x2-x1, y2-y1);
return result; return result;
} }