GLK: Fix having space between prmpt and input text

This commit is contained in:
Paul Gilbert
2018-12-08 19:05:59 -08:00
committed by Paul Gilbert
parent 4b5db1da07
commit d954f70d49
+5 -2
View File
@@ -104,7 +104,9 @@ int Fonts::drawString(const Point &pos, int fontIdx, const byte *rgb, const Comm
Graphics::Font *font = _fontTable[fontIdx];
const uint32 color = _surface->format.RGBToColor(rgb[0], rgb[1], rgb[2]);
font->drawString(_surface, text, pt.x, pt.y, _surface->w - pt.x, color);
return font->getBoundingBox(text, pt.x, pt.y, _surface->w - pt.x).right;
pt.x += font->getStringWidth(text);
return MIN((int)pt.x, (int)_surface->w) * GLI_SUBPIX;
}
int Fonts::drawStringUni(const Point &pos, int fontIdx, const byte *rgb, const Common::U32String &text, int spw) {
@@ -113,7 +115,8 @@ int Fonts::drawStringUni(const Point &pos, int fontIdx, const byte *rgb, const C
const uint32 color = _surface->format.RGBToColor(rgb[0], rgb[1], rgb[2]);
font->drawString(_surface, text, pt.x, pt.y, _surface->w - pt.x, color);
return font->getBoundingBox(text, pt.x, pt.y, _surface->w - pt.x).right * GLI_SUBPIX;
pt.x += font->getStringWidth(text);
return MIN((int)pt.x, (int)_surface->w) * GLI_SUBPIX;
}
size_t Fonts::stringWidth(int fontIdx, const Common::String &text, int spw) {