libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-23 11:04:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GRAPHICS: Fix MacFont assignment

Browse Source 
We're almost back to the functionality with the BDF fonts.
Current missing feature is font autoscaling
This commit is contained in:
Eugene Sandulenko 2017-01-19 08:53:34 +01:00
parent 7d7e8c4af1
commit a95b8f95dd
1 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
graphics/macgui/macfontmanager.cpp
View File

@ -199,9 +199,9 @@ void MacFontManager::loadFonts() {
delete fontstream;
Common::String fontName = Common::String::format("%s-%d", familyName.c_str(), (*assoc)[i]._fontSize);
Common::String fontName = Common::String::format("%s-%d-%d", familyName.c_str(), (*assoc)[i]._fontStyle, (*assoc)[i]._fontSize);
macfont = new MacFont(_fontNames.getVal(fontName, kMacFontNonStandard), (*assoc)[i]._fontSize, (*assoc)[i]._fontStyle);
macfont = new MacFont(_fontNames.getVal(familyName, kMacFontNonStandard), (*assoc)[i]._fontSize, (*assoc)[i]._fontStyle);
FontMan.assignFontToName(fontName, font);
macfont->setFont(font);
@ -249,40 +249,25 @@ const Font *MacFontManager::getFont(MacFont macFont) {
int MacFontManager::parseFontSlant(Common::String slant) {
slant.toUppercase();
int slantVal = 0;
if (slant == "I")
return kMacFontItalic;
slantVal |= kMacFontItalic;
if (slant == "B")
return kMacFontBold;
slantVal |= kMacFontBold;
if (slant == "R")
return kMacFontRegular;
slantVal |= kMacFontRegular;
warning("Unknown font slant '%s'", slant.c_str());
return kMacFontRegular;
return slantVal;
}
const char *MacFontManager::getFontName(int id, int size, int slant) {
static char name[128];
const char *sslant;
switch (slant) {
case kMacFontItalic:
sslant = "I";
break;
case kMacFontBold:
sslant = "B";
break;
case kMacFontRegular:
default:
sslant = "R";
break;
}
if (id > ARRAYSIZE(fontNames))
return NULL;
snprintf(name, 128, "%s-%s-%d", fontNames[id], sslant, size);
snprintf(name, 128, "%s-%d-%d", fontNames[id], slant, size);
return name;
}