diff options
| author | Eugene Sandulenko | 2019-10-17 01:42:44 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2019-10-17 01:42:44 +0200 |
| commit | 6100de0b3a0f869b0dc94b5f961c60206b264bf1 (patch) | |
| tree | 174a062fc1899a5b0f8312e121414d8d55cec989 /graphics/macgui/macfontmanager.cpp | |
| parent | 690370554feaec28aae486816702bb108019c113 (diff) | |
| download | scummvm-rg350-6100de0b3a0f869b0dc94b5f961c60206b264bf1.tar.gz scummvm-rg350-6100de0b3a0f869b0dc94b5f961c60206b264bf1.tar.bz2 scummvm-rg350-6100de0b3a0f869b0dc94b5f961c60206b264bf1.zip | |
GRAPHICS: MACGUI: Add possibility to set WM mode right away
This lets us to not load mac fonts when the built-in mode in enforced
Diffstat (limited to 'graphics/macgui/macfontmanager.cpp')
| -rw-r--r-- | graphics/macgui/macfontmanager.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/graphics/macgui/macfontmanager.cpp b/graphics/macgui/macfontmanager.cpp index 05bdddc840..51c9911b06 100644 --- a/graphics/macgui/macfontmanager.cpp +++ b/graphics/macgui/macfontmanager.cpp @@ -26,6 +26,7 @@ #include "graphics/fonts/bdf.h" #include "graphics/fonts/macfont.h" +#include "graphics/macgui/macwindowmanager.h" #include "graphics/macgui/macfontmanager.h" namespace Graphics { @@ -85,12 +86,16 @@ static const char *const fontStyleSuffixes[] = { "Extend" }; -MacFontManager::MacFontManager() { +MacFontManager::MacFontManager(uint32 mode) : _mode(mode) { for (uint i = 0; i < ARRAYSIZE(fontNames); i++) if (fontNames[i]) _fontIds.setVal(fontNames[i], i); - loadFonts(); + if (_mode & MacGUIConstants::kWMModeForceBuiltinFonts) { + _builtInFonts = true; + } else { + loadFonts(); + } } void MacFontManager::loadFontsBDF() { |