aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2019-12-01 21:54:05 +0100
committerEugene Sandulenko2019-12-01 21:54:05 +0100
commit64eb072103dcb4789858470ac9d40d4c6f3b8841 (patch)
treed42ff2a255b08ed8a3bd3fbd62b7338c4d1ebb10
parentab9c2631f04559f693f6da53e73dcfcf5f72a8c2 (diff)
downloadscummvm-rg350-64eb072103dcb4789858470ac9d40d4c6f3b8841.tar.gz
scummvm-rg350-64eb072103dcb4789858470ac9d40d4c6f3b8841.tar.bz2
scummvm-rg350-64eb072103dcb4789858470ac9d40d4c6f3b8841.zip
GRAPHICS: MACGUI: Fix default font size
-rw-r--r--engines/director/cachedmactext.cpp1
-rw-r--r--graphics/macgui/macfontmanager.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/engines/director/cachedmactext.cpp b/engines/director/cachedmactext.cpp
index c89efc4d06..6d3faff5f6 100644
--- a/engines/director/cachedmactext.cpp
+++ b/engines/director/cachedmactext.cpp
@@ -66,6 +66,7 @@ CachedMacText::CachedMacText(TextCast *const textCast,
:
_surface(NULL), _macText(NULL), _width(defaultWidth), _dirty(true),
_textCast(textCast), _wm(wm) {
+
if (_width == -1) {
if (version >= 4) {
// This came from frame.cpp
diff --git a/graphics/macgui/macfontmanager.h b/graphics/macgui/macfontmanager.h
index a8a3e3a77a..b4efdd7ce2 100644
--- a/graphics/macgui/macfontmanager.h
+++ b/graphics/macgui/macfontmanager.h
@@ -70,7 +70,7 @@ class MacFont {
public:
MacFont(int id = kMacFontChicago, int size = 12, int slant = kMacFontRegular, FontManager::FontUsage fallback = Graphics::FontManager::kBigGUIFont) {
_id = id;
- _size = size;
+ _size = size ? size : 12;
_slant = slant;
_fallback = fallback;
_generated = false;