diff options
author | Eugene Sandulenko | 2016-10-05 23:31:04 +0200 |
---|---|---|
committer | Eugene Sandulenko | 2016-10-05 23:31:04 +0200 |
commit | d8f700c105b9b85d543d6fb6d7133a00235c1b3b (patch) | |
tree | 9c01013de68129f9a7c2174379050d8927e5e491 | |
parent | 15e499772032ae050627e1558904f119815ec51f (diff) | |
download | scummvm-rg350-d8f700c105b9b85d543d6fb6d7133a00235c1b3b.tar.gz scummvm-rg350-d8f700c105b9b85d543d6fb6d7133a00235c1b3b.tar.bz2 scummvm-rg350-d8f700c105b9b85d543d6fb6d7133a00235c1b3b.zip |
GRAPHICS: Use Face Name for Mac fonts if they're specified.
Allows to avoid situations with files named "NewYork" with
"New York" font inside.
-rw-r--r-- | graphics/macgui/macwindowmanager.cpp | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/graphics/macgui/macwindowmanager.cpp b/graphics/macgui/macwindowmanager.cpp index 9e40c368dc..f0f821d313 100644 --- a/graphics/macgui/macwindowmanager.cpp +++ b/graphics/macgui/macwindowmanager.cpp @@ -347,15 +347,20 @@ void MacWindowManager::loadFonts() { delete stream; - Common::String fontName = (*it)->getName(); - - // Trim the .bdf extension - for (int i = fontName.size() - 1; i >= 0; --i) { - if (fontName[i] == '.') { - while ((uint)i < fontName.size()) { - fontName.deleteLastChar(); + Common::String fontName; + if (font->getFaceName() && *font->getFaceName()) { + fontName = font->getFaceName(); + } else { // Get it from the file name + fontName = (*it)->getName(); + + // Trim the .bdf extension + for (int i = fontName.size() - 1; i >= 0; --i) { + if (fontName[i] == '.') { + while ((uint)i < fontName.size()) { + fontName.deleteLastChar(); + } + break; } - break; } } |