MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correctly handle ZWSP in WordWrapString

Browse source
This commit is contained in:
Gleb Mazovetskiy 2021-11-08 01:14:49 +00:00
commit e3dc241c2f
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Source/engine/render/text_render.cpp
View file

@ -288,13 +288,15 @@ std::string WordWrapString(string_view text, size_t width, GameFontTables size,
continue;
}
uint8_t frame = codepoint & 0xFF;
uint32_t unicodeRow = codepoint >> 8;
if (unicodeRow != currentUnicodeRow || kerning == nullptr) {
kerning = LoadFontKerning(size, unicodeRow);
currentUnicodeRow = unicodeRow;
if (codepoint != ZWSP) {
uint8_t frame = codepoint & 0xFF;
uint32_t unicodeRow = codepoint >> 8;
if (unicodeRow != currentUnicodeRow || kerning == nullptr) {
kerning = LoadFontKerning(size, unicodeRow);
currentUnicodeRow = unicodeRow;
}
lineWidth += (*kerning)[frame] + spacing;
}
lineWidth += (*kerning)[frame] + spacing;
const bool isWhitespace = IsWhitespace(codepoint);
if (isWhitespace || IsBreakAllowed(codepoint, nextCodepoint)) {