diff options
| author | Eugene Sandulenko | 2016-10-06 23:48:50 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-10-06 23:49:39 +0200 |
| commit | b2dcd1bb1ef920e7723501c9500a8ef0348be03a (patch) | |
| tree | da8a53526126c8edc7195bcbbb7317cbc6ff0e81 /graphics/macgui/macwindow.cpp | |
| parent | 59a7993951d80d2db651e773f3bb16b12e3f6f56 (diff) | |
| download | scummvm-rg350-b2dcd1bb1ef920e7723501c9500a8ef0348be03a.tar.gz scummvm-rg350-b2dcd1bb1ef920e7723501c9500a8ef0348be03a.tar.bz2 scummvm-rg350-b2dcd1bb1ef920e7723501c9500a8ef0348be03a.zip | |
GRAPHICS: Move font-related MacGUI code to MacFontManager
Diffstat (limited to 'graphics/macgui/macwindow.cpp')
| -rw-r--r-- | graphics/macgui/macwindow.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/graphics/macgui/macwindow.cpp b/graphics/macgui/macwindow.cpp index 2a6e191ded..0fce19e482 100644 --- a/graphics/macgui/macwindow.cpp +++ b/graphics/macgui/macwindow.cpp @@ -23,6 +23,7 @@ #include "graphics/font.h" #include "graphics/primitives.h" #include "common/events.h" +#include "graphics/macgui/macfontmanager.h" #include "graphics/macgui/macwindowmanager.h" #include "graphics/macgui/macwindow.h" #include "image/bmp.h" @@ -67,7 +68,7 @@ MacWindow::~MacWindow() { } const Font *MacWindow::getTitleFont() { - return _wm->getFont("Chicago-12", FontManager::kBigGUIFont); + return _wm->_fontMan->getFont(Graphics::MacFont(kMacFontChicago, 12)); } void MacWindow::setActive(bool active) { @@ -276,7 +277,7 @@ void MacWindow::drawSimpleBorder(ManagedSurface *g) { if (drawTitle) { const Graphics::Font *font = getTitleFont(); - int yOff = _wm->hasBuiltInFonts() ? 3 : 1; + int yOff = _wm->_fontMan->hasBuiltInFonts() ? 3 : 1; int w = font->getStringWidth(_title) + 10; int maxWidth = width - size * 2 - 7; |