games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-04-11 11:31:52 +02:00
Code Issues Releases Activity

Try to fix string width computation rounding error

Browse Source
This commit is contained in:
Ivan Savenko 2024-09-02 22:08:59 +00:00
parent 0acc22214b
commit ed60387041
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
client/windows/CMessage.cpp
View File

@ -73,20 +73,19 @@ std::vector<std::string> CMessage::breakText(std::string text, size_t maxLineWid
// each iteration generates one output line // each iteration generates one output line
while(text.length()) while(text.length())
{ {
ui32 lineWidth = 0; //in characters or given char metric
ui32 wordBreak = -1; //last position for line break (last space character) ui32 wordBreak = -1; //last position for line break (last space character)
ui32 currPos = 0; //current position in text ui32 currPos = 0; //current position in text
bool opened = false; //set to true when opening brace is found bool opened = false; //set to true when opening brace is found
std::string color; //color found std::string color; //color found
size_t symbolSize = 0; // width of character, in bytes size_t symbolSize = 0; // width of character, in bytes
size_t glyphWidth = 0; // width of printable glyph, pixels
std::string printableString;
// loops till line is full or end of text reached // loops till line is full or end of text reached
while(currPos < text.length() && text[currPos] != 0x0a && lineWidth < maxLineWidth) while(currPos < text.length() && text[currPos] != 0x0a)
{ {
symbolSize = TextOperations::getUnicodeCharacterSize(text[currPos]); symbolSize = TextOperations::getUnicodeCharacterSize(text[currPos]);
glyphWidth = graphics->fonts[font]->getGlyphWidth(text.data() + currPos);
// candidate for line break // candidate for line break
if(ui8(text[currPos]) <= ui8(' ')) if(ui8(text[currPos]) <= ui8(' '))
@ -116,7 +115,14 @@ std::vector<std::string> CMessage::breakText(std::string text, size_t maxLineWid
color = ""; color = "";
} }
else else
lineWidth += glyphWidth; {
std::string newPrintableString = printableString;
newPrintableString.append(text.data() + currPos, symbolSize);
if (graphics->fonts[font]->getStringWidth(newPrintableString) < maxLineWidth)
printableString.append(text.data() + currPos, symbolSize);
else
break;
}
currPos += symbolSize; currPos += symbolSize;
} }