diff options
| author | Eugene Sandulenko | 2019-10-19 17:43:47 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2019-10-19 17:43:47 +0200 |
| commit | 2d1dc5d1c4a2de31e925ecff45e177ff1c6a7f7c (patch) | |
| tree | f8088e311416bd32b1c9c29ea4895646aa1b632b /graphics/macgui/mactext.cpp | |
| parent | 50822e708bf21b0e955186675467c025deaba1d5 (diff) | |
| download | scummvm-rg350-2d1dc5d1c4a2de31e925ecff45e177ff1c6a7f7c.tar.gz scummvm-rg350-2d1dc5d1c4a2de31e925ecff45e177ff1c6a7f7c.tar.bz2 scummvm-rg350-2d1dc5d1c4a2de31e925ecff45e177ff1c6a7f7c.zip | |
GRAPHICS: MACGUI: Added default font for MacText
Diffstat (limited to 'graphics/macgui/mactext.cpp')
| -rw-r--r-- | graphics/macgui/mactext.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp index fa2b92f2fc..6dfdee39f1 100644 --- a/graphics/macgui/mactext.cpp +++ b/graphics/macgui/mactext.cpp @@ -66,6 +66,7 @@ MacText::MacText(Common::U32String s, MacWindowManager *wm, const MacFont *macFo _interLinear = interlinear; if (macFont) { + _defaultFormatting = MacFontRun(_wm, macFont->getId(), macFont->getSlant(), macFont->getSize(), 0, 0, 0); _defaultFormatting.font = wm->_fontMan->getFont(*macFont); } else { _defaultFormatting.font = NULL; @@ -97,6 +98,7 @@ MacText::MacText(const Common::String &s, MacWindowManager *wm, const MacFont *m _interLinear = interlinear; if (macFont) { + _defaultFormatting = MacFontRun(_wm, macFont->getId(), macFont->getSlant(), macFont->getSize(), 0, 0, 0); _defaultFormatting.font = wm->_fontMan->getFont(*macFont); } else { _defaultFormatting.font = NULL; @@ -310,7 +312,7 @@ void MacText::render(int from, int to) { // TODO: _textMaxWidth, when -1, was not rendering ANY text. for (uint j = 0; j < _textLines[i].chunks.size(); j++) { - debug(5, "line %d[%d]/%d at %d,%d (%s)", i, j, xOffset, _textLines[i].chunks[j].fontId, _textLines[i].y, _textLines[i].chunks[j].text.c_str()); + debug(5, "line %d[%d]/%d at %d,%d (%s)", i, j, xOffset, _textLines[i].chunks[j].fontId, _textLines[i].y, _textLines[i].chunks[j].text.encode().c_str()); if (_textLines[i].chunks[j].text.empty()) continue; @@ -324,7 +326,7 @@ void MacText::render(int from, int to) { debugN(4, "%2d ", i); for (uint j = 0; j < _textLines[i].chunks.size(); j++) - debugN(4, "[%d (%d)] \"%s\" ", _textLines[i].chunks[j].fontId, _textLines[i].chunks[j].textSlant, _textLines[i].chunks[j].text.c_str()); + debugN(4, "[%d (%d)] \"%s\" ", _textLines[i].chunks[j].fontId, _textLines[i].chunks[j].textSlant, _textLines[i].chunks[j].text.encode().c_str()); debug(4, "%s", ""); } |