diff options
| author | Eugene Sandulenko | 2019-10-19 17:43:47 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2019-10-19 17:43:47 +0200 |
| commit | 2d1dc5d1c4a2de31e925ecff45e177ff1c6a7f7c (patch) | |
| tree | f8088e311416bd32b1c9c29ea4895646aa1b632b /graphics/macgui/macfontmanager.cpp | |
| parent | 50822e708bf21b0e955186675467c025deaba1d5 (diff) | |
| download | scummvm-rg350-2d1dc5d1c4a2de31e925ecff45e177ff1c6a7f7c.tar.gz scummvm-rg350-2d1dc5d1c4a2de31e925ecff45e177ff1c6a7f7c.tar.bz2 scummvm-rg350-2d1dc5d1c4a2de31e925ecff45e177ff1c6a7f7c.zip | |
GRAPHICS: MACGUI: Added default font for MacText
Diffstat (limited to 'graphics/macgui/macfontmanager.cpp')
| -rw-r--r-- | graphics/macgui/macfontmanager.cpp | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/graphics/macgui/macfontmanager.cpp b/graphics/macgui/macfontmanager.cpp index 259fd157eb..ac58b80ae1 100644 --- a/graphics/macgui/macfontmanager.cpp +++ b/graphics/macgui/macfontmanager.cpp @@ -99,6 +99,11 @@ MacFontManager::MacFontManager(uint32 mode) : _mode(mode) { } } +MacFontManager::~MacFontManager() { + for(Common::HashMap<int, const Graphics::Font *>::iterator it = _uniFonts.begin(); it != _uniFonts.end(); it++) + delete it->_value; +} + void MacFontManager::loadFontsBDF() { Common::Archive *dat; @@ -287,7 +292,17 @@ const Font *MacFontManager::getFont(MacFont macFont) { #ifdef USE_FREETYPE2 if (!font) { if (_mode & kWMModeUnicode) { - font = Graphics::loadTTFFontFromArchive("FreeSans.ttf", 16, Graphics::kTTFSizeModeCell, 0, Graphics::kTTFRenderModeMonochrome); + if (macFont.getSize() <= 0) { + debug(1, "MacFontManager::getFont() - Font size <= 0!"); + } + Common::HashMap<int, const Graphics::Font *>::iterator pFont = _uniFonts.find(macFont.getSize()); + + if (pFont != _uniFonts.end()) { + font = pFont->_value; + } else { + font = Graphics::loadTTFFontFromArchive("FreeSans.ttf", macFont.getSize(), Graphics::kTTFSizeModeCharacter, 0, Graphics::kTTFRenderModeMonochrome); + _uniFonts[macFont.getSize()] = font; + } } } #endif |