From 3ae526dfed510c33a55a9f19b8ccba8e97d13f79 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Fri, 18 Oct 2019 00:20:54 +0200
Subject: GRAPHICS: MACGUI: Added support for Unicode fonts in menu

---
 graphics/macgui/macfontmanager.cpp | 9 ++++++++-
 graphics/macgui/macwindowmanager.h | 3 ++-
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'graphics/macgui')

diff --git a/graphics/macgui/macfontmanager.cpp b/graphics/macgui/macfontmanager.cpp
index 51c9911b06..4faafa4054 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 ee9fc359a2..2e3e3128c3 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)
 };
 
 }
-- 
cgit v1.2.3