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

Merge pull request #1364 from minggo/gles20 

merge pull request to resolve deprecation warnings
This commit is contained in:
minggo 2012-09-23 19:35:55 -07:00
parent 2c9399cdea 5e225467e4
commit ff40b010f0
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cocos2dx/platform/ios/FontLabel/FontLabel.m
View File

@ -118,15 +118,18 @@
} }
size.width = MIN(size.width, origSize.width); size.width = MIN(size.width, origSize.width);
// adjust the point for alignment // adjust the point for alignment
switch (self.textAlignment) { switch ((NSTextAlignment)self.textAlignment) {
case UITextAlignmentLeft: case NSTextAlignmentLeft:
break; break;
case UITextAlignmentCenter: case NSTextAlignmentCenter:
point.x += (origSize.width - size.width) / 2.0f; point.x += (origSize.width - size.width) / 2.0f;
break; break;
case UITextAlignmentRight: case NSTextAlignmentRight:
point.x += origSize.width - size.width; point.x += origSize.width - size.width;
break; break;
case NSTextAlignmentJustified:
case NSTextAlignmentNatural:
default: break;
} }
[self.text drawAtPoint:point forWidth:size.width withZFont:actualFont lineBreakMode:self.lineBreakMode]; [self.text drawAtPoint:point forWidth:size.width withZFont:actualFont lineBreakMode:self.lineBreakMode];
} else { } else {

11
cocos2dx/platform/ios/FontLabel/FontLabelStringDrawing.m
View File

@ -637,16 +637,19 @@ static CGSize drawOrSizeTextConstrainedToSize(BOOL performDraw, NSString *string
// draw // draw
if (performDraw) { if (performDraw) {
switch (alignment) { switch ((NSTextAlignment)alignment) {
case UITextAlignmentLeft: case NSTextAlignmentLeft:
drawPoint.x = 0; drawPoint.x = 0;
break; break;
case UITextAlignmentCenter: case NSTextAlignmentCenter:
drawPoint.x = (constrainedSize.width - lineSize.width) / 2.0f; drawPoint.x = (constrainedSize.width - lineSize.width) / 2.0f;
break; break;
case UITextAlignmentRight: case NSTextAlignmentRight:
drawPoint.x = constrainedSize.width - lineSize.width; drawPoint.x = constrainedSize.width - lineSize.width;
break; break;
case NSTextAlignmentJustified:
case NSTextAlignmentNatural:
default: break;
} }
NSUInteger stopGlyphIdx = glyphIdx; NSUInteger stopGlyphIdx = glyphIdx;
NSUInteger lastRunIdx = currentRunIdx; NSUInteger lastRunIdx = currentRunIdx;