Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-01-18 23:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed an issue where long words would sometimes render partly outside the designated text area.

Browse source
This commit is contained in:
Leon Styhre 2021-03-09 17:19:26 +01:00
parent 6a57a44df9
commit 172182a4e8
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
es-core/src/resources/Font.cpp
View file

@ -447,10 +447,12 @@ std::string Font::wrapText(std::string text, float xLen)
std::string out; std::string out;
std::string line; std::string line;
std::string word; std::string word;
std::string abbreviatedWord;
std::string temp; std::string temp;
size_t space; size_t space;
Vector2f textSize; Vector2f textSize;
float dotsSize = sizeText("...").x();
// While there's text or we still have text to render. // While there's text or we still have text to render.
while (text.length() > 0) { while (text.length() > 0) {
@ -472,7 +474,20 @@ std::string Font::wrapText(std::string text, float xLen)
} }
else { else {
// The next word won't fit, so break here. // The next word won't fit, so break here.
// If the word is too long to fit within xLen, then abbreviate it.
if (xLen > 0 && sizeText(word).x() > xLen) {
float length = xLen - dotsSize;
if (length < 0)
length = 0;
abbreviatedWord = getTextMaxWidth(word, length);
abbreviatedWord += "...";
word = abbreviatedWord;
out += line;
}
else {
out += line + '\n'; out += line + '\n';
}
line = word; line = word;
} }
} }