[Scummvm-git-logs] scummvm master -> 1c4b895b549a4903b9207039d5e1a1be1a1fc343

[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:
1c4b895b54 GRAPHICS: MACGUI: Fix setting default font for MacText


Commit: 1c4b895b549a4903b9207039d5e1a1be1a1fc343
    https://github.com/scummvm/scummvm/commit/1c4b895b549a4903b9207039d5e1a1be1a1fc343
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-04-28T23:50:59+02:00

Commit Message:
GRAPHICS: MACGUI: Fix setting default font for MacText

Changed paths:
    graphics/macgui/mactext.cpp
    graphics/macgui/mactext.h


diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp
index 2c417e4a60..e3ac84cd1d 100644
--- a/graphics/macgui/mactext.cpp
+++ b/graphics/macgui/mactext.cpp
@@ -127,6 +127,16 @@ void MacText::setMaxWidth(int maxWidth) {
 	_fullRefresh = true;
 }
 
+void MacText::setDefaultFormatting(uint16 fontId, byte textSlant, uint16 fontSize,
+		uint16 palinfo1, uint16 palinfo2, uint16 palinfo3) {
+	_defaultFormatting.setValues(_defaultFormatting.wm, fontId, textSlant, fontSize, palinfo1, palinfo2, palinfo3);
+
+	MacFont macFont = MacFont(fontId, fontSize, textSlant);
+
+	_defaultFormatting.font = _wm->_fontMan->getFont(macFont);
+}
+
+
 static const Common::U32String::value_type *readHex(uint16 *res, const Common::U32String::value_type *s, int len) {
 	*res = 0;
 
diff --git a/graphics/macgui/mactext.h b/graphics/macgui/mactext.h
index b47d19a2f5..101334aaed 100644
--- a/graphics/macgui/mactext.h
+++ b/graphics/macgui/mactext.h
@@ -101,10 +101,8 @@ public:
 	int getInterLinear() { return _interLinear; }
 	void setInterLinear(int interLinear);
 	void setMaxWidth(int maxWidth);
-	void setDefaultFormatting(uint16 fontId_, byte textSlant_, uint16 fontSize_,
-			uint16 palinfo1_, uint16 palinfo2_, uint16 palinfo3_) {
-				_defaultFormatting.setValues(_defaultFormatting.wm, fontId_, textSlant_, fontSize_, palinfo1_, palinfo2_, palinfo3_);
-			}
+	void setDefaultFormatting(uint16 fontId, byte textSlant, uint16 fontSize,
+			uint16 palinfo1, uint16 palinfo2, uint16 palinfo3);
 
 	const MacFontRun &getDefaultFormatting() { return _defaultFormatting; }