[Scummvm-git-logs] scummvm master -> 3ae526dfed510c33a55a9f19b8ccba8e97d13f79

[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:
3ae526dfed GRAPHICS: MACGUI: Added support for Unicode fonts in menu


Commit: 3ae526dfed510c33a55a9f19b8ccba8e97d13f79
    https://github.com/scummvm/scummvm/commit/3ae526dfed510c33a55a9f19b8ccba8e97d13f79
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-10-18T00:20:54+02:00

Commit Message:
GRAPHICS: MACGUI: Added support for Unicode fonts in menu

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


diff --git a/engines/pink/director.cpp b/engines/pink/director.cpp
index 8560469..64c52d7 100644
--- a/engines/pink/director.cpp
+++ b/engines/pink/director.cpp
@@ -91,7 +91,8 @@ static void redrawCallback(void *ref) {
 Director::Director()
 	: _surface(640, 480), _textRendered(false) {
 	_wm = new Graphics::MacWindowManager(Graphics::kWMModeNoDesktop | Graphics::kWMModeAutohideMenu
-		| Graphics::kWMModalMenuMode | Graphics::kWMModeForceBuiltinFonts);
+		| Graphics::kWMModalMenuMode | Graphics::kWMModeForceBuiltinFonts
+		| Graphics::kWMModeUnicode);
 
 	_wm->setScreen(&_surface);
 	_wm->setMenuHotzone(Common::Rect(0, 0, 640, 23));
diff --git a/graphics/macgui/macfontmanager.cpp b/graphics/macgui/macfontmanager.cpp
index 51c9911..4faafa4 100644
--- a/graphics/macgui/macfontmanager.cpp
+++ b/graphics/macgui/macfontmanager.cpp
@@ -25,6 +25,7 @@
 #include "common/macresman.h"
 #include "graphics/fonts/bdf.h"
 #include "graphics/fonts/macfont.h"
+#include "graphics/fonts/ttf.h"
 
 #include "graphics/macgui/macwindowmanager.h"
 #include "graphics/macgui/macfontmanager.h"
@@ -283,7 +284,13 @@ const Font *MacFontManager::getFont(MacFont macFont) {
 		}
 	}
 
-	if (_builtInFonts || !font)
+	if (_builtInFonts || !font) {
+		if (_mode & kWMModeUnicode) {
+			font = Graphics::loadTTFFontFromArchive("FreeSans.ttf", 16, Graphics::kTTFSizeModeCell, 0, Graphics::kTTFRenderModeMonochrome);
+		}
+	}
+
+	if (!font)
 		font = FontMan.getFontByUsage(macFont.getFallback());
 
 	return font;
diff --git a/graphics/macgui/macwindowmanager.h b/graphics/macgui/macwindowmanager.h
index ee9fc35..2e3e312 100644
--- a/graphics/macgui/macwindowmanager.h
+++ b/graphics/macgui/macwindowmanager.h
@@ -61,7 +61,8 @@ enum {
 	kWMModeNoDesktop    	= (1 << 0),
 	kWMModeAutohideMenu 	= (1 << 1),
 	kWMModalMenuMode 		= (1 << 2),
-	kWMModeForceBuiltinFonts= (1 << 3)
+	kWMModeForceBuiltinFonts= (1 << 3),
+	kWMModeUnicode			= (1 << 4)
 };
 
 }