GUI: load ttf from archive in Unicode branch

This commit is contained in:
InariInDream 2024-04-26 17:34:14 +08:00 committed by Eugene Sandulenko
parent bd867b109a
commit cea8312c35

View File

@ -531,14 +531,23 @@ const Font *MacFontManager::getFont(MacFont *macFont) {
if (pFont != _uniFonts.end()) {
font = pFont->_value;
} else {
font = Graphics::loadTTFFontFromArchive("FreeSans.ttf", macFont->getSize(), Graphics::kTTFSizeModeCharacter, 0, 0, Graphics::kTTFRenderModeMonochrome);
_uniFonts[macFont->getSize()] = font;
int newId = macFont->getId();
int newSlant = macFont->getSlant();
int familyId = getFamilyId(newId, newSlant);
if (_fontInfo.contains(familyId)) {
font = Graphics::loadTTFFontFromArchive(_fontInfo[familyId]->name, macFont->getSize(), Graphics::kTTFSizeModeCharacter, 0, 0, Graphics::kTTFRenderModeMonochrome);
_uniFonts[macFont->getSize()] = font;
} else {
font = Graphics::loadTTFFontFromArchive("FreeSans.ttf", macFont->getSize(), Graphics::kTTFSizeModeCharacter, 0, 0, Graphics::kTTFRenderModeMonochrome);
_uniFonts[macFont->getSize()] = font;
}
}
} else {
int newId = macFont->getId();
int newSlant = macFont->getSlant();
int familyId = getFamilyId(newId, newSlant);
font = Graphics::loadTTFFontFromArchive(_fontInfo[familyId]->name, macFont->getSize(), Graphics::kTTFSizeModeCharacter, 0, 0, Graphics::kTTFRenderModeMonochrome);
_uniFonts[macFont->getSize()] = font;
}
}
#endif