[Scummvm-git-logs] scummvm master -> 15ac5da3a3a080c084bc72e376c68a88797a4f06

[sev-]

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

Summary:
94e543c5c8 GRAPHICS: MACGUI: Implement enforcing built-in fonts
15ac5da3a3 PINK: Do not use Mac fonts for menu rendering


Commit: 94e543c5c8ec77a20261554d8c22af65bfc5ac0d
    https://github.com/scummvm/scummvm/commit/94e543c5c8ec77a20261554d8c22af65bfc5ac0d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-10-04T20:22:59+02:00

Commit Message:
GRAPHICS: MACGUI: Implement enforcing built-in fonts

Changed paths:
    graphics/macgui/macfontmanager.h
    graphics/macgui/macwindowmanager.cpp
    graphics/macgui/macwindowmanager.h


diff --git a/graphics/macgui/macfontmanager.h b/graphics/macgui/macfontmanager.h
index ddd9282..6297202 100644
--- a/graphics/macgui/macfontmanager.h
+++ b/graphics/macgui/macfontmanager.h
@@ -134,6 +134,8 @@ public:
 	void registerFontMapping(uint16 id, Common::String name);
 	void clearFontMapping();
 
+	void forceBuiltinFonts() { _builtInFonts = true; }
+
 private:
 	void loadFontsBDF();
 	void loadFonts();
diff --git a/graphics/macgui/macwindowmanager.cpp b/graphics/macgui/macwindowmanager.cpp
index 57da022..65a5da5 100644
--- a/graphics/macgui/macwindowmanager.cpp
+++ b/graphics/macgui/macwindowmanager.cpp
@@ -191,6 +191,14 @@ MacWindowManager::~MacWindowManager() {
 	g_system->getTimerManager()->removeTimerProc(&menuTimerHandler);
 }
 
+void MacWindowManager::setMode(uint32 mode) {
+	_mode = mode;
+
+	if (mode & kWMModeForceBuiltinFonts)
+		_fontMan->forceBuiltinFonts();
+}
+
+
 MacWindow *MacWindowManager::addWindow(bool scrollable, bool resizable, bool editable) {
 	MacWindow *w = new MacWindow(_lastId, scrollable, resizable, editable, this);
 
diff --git a/graphics/macgui/macwindowmanager.h b/graphics/macgui/macwindowmanager.h
index 97272d3..967a5cd 100644
--- a/graphics/macgui/macwindowmanager.h
+++ b/graphics/macgui/macwindowmanager.h
@@ -57,10 +57,11 @@ enum {
 };
 
 enum {
-	kWMModeNone         = 0,
-	kWMModeNoDesktop    = (1 << 0),
-	kWMModeAutohideMenu = (1 << 1),
-	kWMModalMenuMode = (1 << 2)
+	kWMModeNone         	= 0,
+	kWMModeNoDesktop    	= (1 << 0),
+	kWMModeAutohideMenu 	= (1 << 1),
+	kWMModalMenuMode 		= (1 << 2),
+	kWMModeForceBuiltinFonts= (1 << 3)
 };
 
 }
@@ -211,7 +212,7 @@ public:
 
 	void pauseEngine(bool pause);
 
-	void setMode(uint32 mode) { _mode = mode; }
+	void setMode(uint32 mode);
 
 	void setEnginePauseCallback(void *engine, void (*pauseCallback)(void *engine, bool pause));
 


Commit: 15ac5da3a3a080c084bc72e376c68a88797a4f06
    https://github.com/scummvm/scummvm/commit/15ac5da3a3a080c084bc72e376c68a88797a4f06
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-10-04T20:23:18+02:00

Commit Message:
PINK: Do not use Mac fonts for menu rendering

Changed paths:
    engines/pink/director.cpp


diff --git a/engines/pink/director.cpp b/engines/pink/director.cpp
index eef2506..bb59ff9 100644
--- a/engines/pink/director.cpp
+++ b/engines/pink/director.cpp
@@ -82,7 +82,8 @@ static const Graphics::MacMenuData menuSubItems[] = {
 Director::Director()
 	: _surface(640, 480), _textRendered(false) {
 	_wm.setScreen(&_surface);
-	_wm.setMode(Graphics::kWMModeNoDesktop | Graphics::kWMModeAutohideMenu | Graphics::kWMModalMenuMode);
+	_wm.setMode(Graphics::kWMModeNoDesktop | Graphics::kWMModeAutohideMenu | Graphics::kWMModalMenuMode |
+				Graphics::kWMModeForceBuiltinFonts);
 	_wm.setMenuHotzone(Common::Rect(0, 0, 640, 23));
 	_wm.setMenuDelay(250000);
 }