ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

GRAPHICS: MACGUI: Use regular slant as font substitutes

Browse Source
This commit is contained in:
Eugene Sandulenko
2020-01-07 21:57:12 +01:00
parent 0916150421
commit bfd796fec2
1 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graphics/macgui/macfontmanager.cpp
+30 -12
View File
@@ -405,35 +405,53 @@ void MacFontManager::generateFontSubstitute(MacFont &macFont) {
// No simple substitute was found. Looking for neighborhood fonts
// First we gather all font sizes for this font
Common::Array<int> sizes;
Common::Array<MacFont *> sizes;
for (Common::HashMap<Common::String, MacFont *>::iterator i = _fontRegistry.begin(); i != _fontRegistry.end(); ++i) {
if (i->_value->getId() == macFont.getId() && i->_value->getSlant() == macFont.getSlant() && !i->_value->isGenerated())
sizes.push_back(i->_value->getSize());
sizes.push_back(i->_value);
}
if (sizes.empty()) {
debug(1, "No viable substitute found for font %s", getFontName(macFont).c_str());
return;
if (macFont.getSlant() == kMacFontRegular) {
debug(1, "No viable substitute found for font %s", getFontName(macFont).c_str());
return;
}
// Now let's try to find a regular font
for (Common::HashMap<Common::String, MacFont *>::iterator i = _fontRegistry.begin(); i != _fontRegistry.end(); ++i) {
if (i->_value->getId() == macFont.getId() && i->_value->getSlant() == kMacFontRegular && !i->_value->isGenerated())
sizes.push_back(i->_value);
}
if (sizes.empty()) {
debug(1, "No viable substitute found for font %s", getFontName(macFont).c_str());
return;
}
}
// Now looking next larger font, and store the largest one for next check
int candidate = 1000;
int maxSize = sizes[0];
// Now looking for the next larger font, and store the largest one for next check
MacFont *candidate = nullptr;
MacFont *maxSize = sizes[0];
for (uint i = 0; i < sizes.size(); i++) {
if (sizes[i] > macFont.getSize() && sizes[i] < candidate)
if (sizes[i]->getSize() == macFont.getSize()) { // Same size but regular slant
candidate = sizes[i];
break;
}
if (sizes[i]->getSize() > macFont.getSize() && candidate && sizes[i]->getSize() < candidate->getSize())
candidate = sizes[i];
if (sizes[i] > maxSize)
if (sizes[i]->getSize() > maxSize->getSize())
maxSize = sizes[i];
}
if (candidate != 1000) {
generateFont(macFont, *_fontRegistry[getFontName(macFont.getId(), candidate, macFont.getSlant())]);
if (candidate) {
generateFont(macFont, *candidate);
return;
}
// Now next smaller font, which is the biggest we have
generateFont(macFont, *_fontRegistry[getFontName(macFont.getId(), maxSize, macFont.getSlant())]);
generateFont(macFont, *maxSize);
}
void MacFontManager::generateFont(MacFont &toFont, MacFont &fromFont) {