[Scummvm-git-logs] scummvm master -> 64eb072103dcb4789858470ac9d40d4c6f3b8841

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
64eb072103 GRAPHICS: MACGUI: Fix default font size


Commit: 64eb072103dcb4789858470ac9d40d4c6f3b8841
    https://github.com/scummvm/scummvm/commit/64eb072103dcb4789858470ac9d40d4c6f3b8841
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-12-01T21:54:05+01:00

Commit Message:
GRAPHICS: MACGUI: Fix default font size

Changed paths:
    engines/director/cachedmactext.cpp
    graphics/macgui/macfontmanager.h


diff --git a/engines/director/cachedmactext.cpp b/engines/director/cachedmactext.cpp
index c89efc4..6d3faff 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 a8a3e3a..b4efdd7 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;