ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix FPS drawing if there it's translated

Browse Source
This commit is contained in:
Benau 2019-06-17 10:37:32 +08:00
parent 5853ffc15d
commit d44275a1f6
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/font/font_with_face.cpp
View File

@ -1021,7 +1021,7 @@ void FontWithFace::drawTextQuick(const core::stringw& text,
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
/** Convert text to drawable GlyphLayout without text shaping, used in digit /** Convert text to drawable GlyphLayout without text shaping, used in digit
* font or debugging message, it will only use the preloaded characters. */ * font or debugging message. */
std::vector<gui::GlyphLayout> FontWithFace:: std::vector<gui::GlyphLayout> FontWithFace::
text2GlyphsWithoutShaping(const core::stringw& t) text2GlyphsWithoutShaping(const core::stringw& t)
{ {
@ -1042,7 +1042,18 @@ std::vector<gui::GlyphLayout> FontWithFace::
} }
auto ret = m_character_glyph_info_map.find(c); auto ret = m_character_glyph_info_map.find(c);
if (ret == m_character_glyph_info_map.end()) if (ret == m_character_glyph_info_map.end())
continue; {
unsigned font = 0;
unsigned glyph = 0;
if (!m_face_ttf->getFontAndGlyphFromChar(c, &font, &glyph))
{
m_character_glyph_info_map[c] = GlyphInfo(font, glyph);
continue;
}
m_character_glyph_info_map[c] = GlyphInfo(font, glyph);
ret = m_character_glyph_info_map.find(c);
insertGlyph(font, glyph);
}
const FontArea* area = m_face_ttf->getFontArea const FontArea* area = m_face_ttf->getFontArea
(ret->second.font_number, ret->second.glyph_index); (ret->second.font_number, ret->second.glyph_index);
if (area == NULL) if (area == NULL)