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

Merge pull request #14813 from xiaofeng11/v3.10_xf_fix 

Fix boundingRectWithSize compile failed with OSX 10.10 or lower version SDK
This commit is contained in:
zilongshanren 2015-12-30 13:51:41 +08:00
parent 2feed57572 770f3d7f8e
commit efbbdb1f58
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cocos/platform/mac/CCDevice-mac.mm
View File

@ -73,7 +73,15 @@ static NSSize _calculateStringSize(NSString *str, id font, CGSize *constrainSize
NSSize dim;
NSDictionary *attibutes = @{NSFontAttributeName:font};
#ifdef __MAC_10_11
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= __MAC_10_11
dim = [str boundingRectWithSize:textRect options:(NSStringDrawingOptions)(NSStringDrawingUsesLineFragmentOrigin) attributes:attibutes context:nil].size;
#else
dim = [str boundingRectWithSize:textRect options:(NSStringDrawingOptions)(NSStringDrawingUsesLineFragmentOrigin) attributes:attibutes].size;
#endif
#else
dim = [str boundingRectWithSize:textRect options:(NSStringDrawingOptions)(NSStringDrawingUsesLineFragmentOrigin) attributes:attibutes].size;
#endif
dim.width = ceilf(dim.width);
dim.height = ceilf(dim.height);