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

Merge pull request #14246 from WenhaiLin/v3.9 

Fixed text may display of incomplete when Label create with system font on Mac.
This commit is contained in:
pandamicro 2015-10-28 15:47:45 +08:00
parent b6b9364a84 7b758fd780
commit 893edbaf24
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,6 +122,7 @@ static bool _initWithString(const char * text, Device::TextAlign align, const ch
// linebreak // linebreak
if (info->width > 0) { if (info->width > 0) {
if ([string sizeWithAttributes:tokenAttributesDict].width > info->width) { if ([string sizeWithAttributes:tokenAttributesDict].width > info->width) {
int nextLineTop = 0;
NSMutableString *lineBreak = [[[NSMutableString alloc] init] autorelease]; NSMutableString *lineBreak = [[[NSMutableString alloc] init] autorelease];
NSUInteger length = [string length]; NSUInteger length = [string length];
NSRange range = NSMakeRange(0, 1); NSRange range = NSMakeRange(0, 1);
@ -136,8 +137,6 @@ static bool _initWithString(const char * text, Device::TextAlign align, const ch
lastBreakLocation = i + insertCount; lastBreakLocation = i + insertCount;
} }
textSize = [lineBreak sizeWithAttributes:tokenAttributesDict]; textSize = [lineBreak sizeWithAttributes:tokenAttributesDict];
if(info->height > 0 && (int)textSize.height > info->height)
break;
if ((int)textSize.width > info->width) { if ((int)textSize.width > info->width) {
if(lastBreakLocation > 0) { if(lastBreakLocation > 0) {
[lineBreak insertString:@"\r" atIndex:lastBreakLocation]; [lineBreak insertString:@"\r" atIndex:lastBreakLocation];
@ -147,6 +146,10 @@ static bool _initWithString(const char * text, Device::TextAlign align, const ch
[lineBreak insertString:@"\r" atIndex:[lineBreak length] - 1]; [lineBreak insertString:@"\r" atIndex:[lineBreak length] - 1];
} }
insertCount += 1; insertCount += 1;
nextLineTop += (int)textSize.height;
if(info->height > 0 && nextLineTop > (int)info->height)
break;
} }
} }