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

Fixes for iOS7 and Xcode5

This commit is contained in:
Ricardo Quesada 2013-06-11 12:11:05 -07:00
parent ef319da264
commit af49023741
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cocos2dx/platform/ios/CCImage.mm
View File

@ -300,7 +300,7 @@ static bool _initWithString(const char * pText, cocos2d::CCImage::ETextAlign eAl
dim.width,
dim.height,
8,
dim.width * 4,
(int)(dim.width) * 4,
colorSpace,
kCGImageAlphaPremultipliedLast | kCGBitmapByteOrder32Big);
@ -390,7 +390,8 @@ static bool _initWithString(const char * pText, cocos2d::CCImage::ETextAlign eAl
// actually draw the text in the context
[str drawInRect:CGRectMake(textOriginX, textOrigingY, textWidth, textHeight) withFont:font lineBreakMode:(UILineBreakMode)UILineBreakModeWordWrap alignment:align];
// XXX: ios7 casting
[str drawInRect:CGRectMake(textOriginX, textOrigingY, textWidth, textHeight) withFont:font lineBreakMode:NSLineBreakByWordWrapping alignment:(NSTextAlignment)align];
// pop the context
UIGraphicsPopContext();

2
cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
214624b54f2baf92a539bacaf87917fe64ad439c
fa60dbec00f648a7eeff29e2da5267a9d9edfd06

2
samples/Cpp/TestCpp/proj.ios/TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
509eda87a0dd525207e23c811e04786bf5b2e3c6
b9541b02e155ec9f3c7c9a241697f058edd4820f

2
samples/Cpp/TestCpp/proj.mac/TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
04925ef9a72a8d03563f5578810893e794504e6e
51b5fe73603097107dc665678709aaf6234d5627