thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GRAPHICS: Use MacFont in lieu of Graphics::Font in MacText

Browse source
This commit is contained in:
Tobia Tesan 2017-04-30 00:14:23 +02:00 • committed by Eugene Sandulenko
parent d602850b0c
commit af664fe757
3 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
graphics/macgui/mactext.cpp
View file

@ -37,10 +37,10 @@ const Font *MacFontRun::getFont() {
return font;
}
MacText::MacText(Common::String s, MacWindowManager *wm, const Font *font, int fgcolor, int bgcolor, int maxWidth, TextAlign textAlignment) {
MacText::MacText(Common::String s, MacWindowManager *wm, const MacFont *macFont, int fgcolor, int bgcolor, int maxWidth, TextAlign textAlignment) {
_str = s;
_wm = wm;
_font = font;
_macFont = macFont;
_fgcolor = fgcolor;
_bgcolor = bgcolor;
_maxWidth = maxWidth;
@ -51,7 +51,12 @@ MacText::MacText(Common::String s, MacWindowManager *wm, const Font *font, int f
_interLinear = 0; // 0 pixels between the lines by default
_defaultFormatting.font = font;
if (macFont) {
_defaultFormatting.font = wm->_fontMan->getFont(*macFont);
} else {
_defaultFormatting.font = NULL;
}
_defaultFormatting.wm = wm;
_currentFormatting = _defaultFormatting;