mirrors/mkxp-z
1
0
Fork 0
mirror of https://github.com/mkxp-z/mkxp-z.git synced 2025-03-28 14:56:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Only draw enough of the text to fill the rect we were given

Browse source
This commit is contained in:
Wayward Heart 2023-12-03 15:48:12 -06:00
parent 3013da8e17
commit 3ba2ed9d45
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/display/bitmap.cpp
View file

@ -2058,6 +2058,15 @@ void Bitmap::drawText(const IntRect &rect, const char *str, int align)
SDL_Color c = fontColor.toSDLColor();
c.a = 255;
// Trim the text to only fill double the rect width
int charLimit = 0;
float squeezeLimit = 0.5f;
if (TTF_MeasureUTF8(font, str, std::min(width() - rect.x, rect.w) / squeezeLimit, &charLimit, nullptr) == 0)
{
fixed = fixed.substr(0, charLimit + 1);
str = fixed.c_str();
}
SDL_Surface *txtSurf;
if (p->font->isSolid())
@ -2131,7 +2140,7 @@ void Bitmap::drawText(const IntRect &rect, const char *str, int align)
* have made the rects bigger to compensate, so we should probably match it */
float squeeze = (float) rect.w / txtSurf->w;
squeeze = clamp(squeeze, 0.5f, 1.0f);
squeeze = clamp(squeeze, squeezeLimit, 1.0f);
IntRect destRect(alignX, alignY, 0, 0);
destRect.w = std::min(rect.w, (int)(txtSurf->w * squeeze));