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

Don't count spaces at the end of line as part of the line width (#18751)

This commit is contained in:
Jordi Vilalta Prat 2018-04-04 05:53:16 +02:00 committed by minggo
parent 383c5afa6b
commit 712b093b27
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cocos/2d/CCLabelTextFormatter.cpp
View File

@ -236,8 +236,11 @@ bool Label::multilineTextWrap(const std::function<int(const std::u32string&, int
nextLetterX += _horizontalKernings[letterIndex + 1]; nextLetterX += _horizontalKernings[letterIndex + 1];
nextLetterX += letterDef.xAdvance * _bmfontScale + _additionalKerning; nextLetterX += letterDef.xAdvance * _bmfontScale + _additionalKerning;
if (tokenLen != 1 || !StringUtils::isUnicodeSpace(character))
{
tokenRight = nextLetterX / contentScaleFactor; tokenRight = nextLetterX / contentScaleFactor;
} }
}
nextChangeSize = true; nextChangeSize = true;
if (tokenHighestY < letterPosition.y) if (tokenHighestY < letterPosition.y)