[Scummvm-git-logs] scummvm master -> 547c8f3e0340b37ef2191b9afcb2c4cfaa23facc

[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:
547c8f3e03 GRAPHICS: MACTEXT: Fix MacText color when using U32String


Commit: 547c8f3e0340b37ef2191b9afcb2c4cfaa23facc
    https://github.com/scummvm/scummvm/commit/547c8f3e0340b37ef2191b9afcb2c4cfaa23facc
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-09-22T18:06:33+02:00

Commit Message:
GRAPHICS: MACTEXT: Fix MacText color when using U32String

Fixed HelpDialog on classic theme

Changed paths:
    graphics/macgui/mactext.cpp


diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp
index 802918d2ace..ed7dca64583 100644
--- a/graphics/macgui/mactext.cpp
+++ b/graphics/macgui/mactext.cpp
@@ -162,6 +162,9 @@ MacText::MacText(const Common::U32String &s, MacWindowManager *wm, const MacFont
 	if (macFont) {
 		_defaultFormatting = MacFontRun(_wm, macFont->getId(), macFont->getSlant(), macFont->getSize(), 0, 0, 0);
 		_defaultFormatting.font = wm->_fontMan->getFont(*macFont);
+		byte r, g, b;
+		_wm->_pixelformat.colorToRGB(fgcolor, r, g, b);
+		_defaultFormatting.setValues(_wm, macFont->getId(), macFont->getSlant(), macFont->getSize(), r, g, b);
 	} else {
 		_defaultFormatting.font = NULL;
 	}