mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-21 08:02:39 +08:00
fix label ttf resize_height line wrap
This commit is contained in:
@@ -80,14 +80,19 @@ int Label::getFirstCharLen(const std::u16string& utf16Text, int startIndex, int
|
||||
int Label::getFirstWordLen(const std::u16string& utf16Text, int startIndex, int textLen)
|
||||
{
|
||||
auto character = utf16Text[startIndex];
|
||||
if (StringUtils::isCJKUnicode(character) || StringUtils::isUnicodeSpace(character) || character == (char16_t)TextFormatter::NewLine)
|
||||
if (StringUtils::isCJKUnicode(character)
|
||||
|| StringUtils::isUnicodeSpace(character)
|
||||
|| character == (char16_t)TextFormatter::NewLine)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
int len = 1;
|
||||
FontLetterDefinition letterDef;
|
||||
auto nextLetterX = 0;
|
||||
if(_fontAtlas->getLetterDefinitionForChar(character, letterDef) == false) {
|
||||
return len;
|
||||
}
|
||||
auto nextLetterX = letterDef.xAdvance * _bmfontScale + _additionalKerning;
|
||||
auto contentScaleFactor = CC_CONTENT_SCALE_FACTOR();
|
||||
for (int index = startIndex + 1; index < textLen; ++index)
|
||||
{
|
||||
@@ -100,14 +105,14 @@ int Label::getFirstWordLen(const std::u16string& utf16Text, int startIndex, int
|
||||
if (_maxLineWidth > 0.f && letterX + letterDef.width * _bmfontScale > _maxLineWidth
|
||||
&& !StringUtils::isUnicodeSpace(character))
|
||||
{
|
||||
if(len >= 2) {
|
||||
return len -1;
|
||||
}
|
||||
return len;
|
||||
}
|
||||
|
||||
nextLetterX += letterDef.xAdvance * _bmfontScale + _additionalKerning;
|
||||
|
||||
if (character == (char16_t)TextFormatter::NewLine || StringUtils::isUnicodeSpace(character) || StringUtils::isCJKUnicode(character))
|
||||
if (character == (char16_t)TextFormatter::NewLine
|
||||
|| StringUtils::isUnicodeSpace(character)
|
||||
|| StringUtils::isCJKUnicode(character))
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user