diff options
| author | Eugene Sandulenko | 2017-08-02 10:15:47 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2017-08-04 21:54:19 +0200 |
| commit | 4897f6618b6d4613f54a1ea323231454ece0c0c3 (patch) | |
| tree | c621ca4ebd25b5fd943e822aeee11cbe517da364 | |
| parent | 8fff8bcb3eb65a5ac636358421d4fb89ebd2c4db (diff) | |
| download | scummvm-rg350-4897f6618b6d4613f54a1ea323231454ece0c0c3.tar.gz scummvm-rg350-4897f6618b6d4613f54a1ea323231454ece0c0c3.tar.bz2 scummvm-rg350-4897f6618b6d4613f54a1ea323231454ece0c0c3.zip | |
GRAPHICS: MACGUI: Pass default formatting to MacText
| -rw-r--r-- | graphics/macgui/mactext.h | 4 | ||||
| -rw-r--r-- | graphics/macgui/mactextwindow.cpp | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/graphics/macgui/mactext.h b/graphics/macgui/mactext.h index fdb90d4ae8..8e25dcfdd1 100644 --- a/graphics/macgui/mactext.h +++ b/graphics/macgui/mactext.h @@ -95,6 +95,10 @@ public: int getInterLinear() { return _interLinear; } void setInterLinear(int interLinear); + 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 draw(ManagedSurface *g, int x, int y, int w, int h, int xoff, int yoff); void resizeAndFormatLines(uint numNewLines, MacFontRun * fontRun); diff --git a/graphics/macgui/mactextwindow.cpp b/graphics/macgui/mactextwindow.cpp index c8e3a937cc..182f1e0e1d 100644 --- a/graphics/macgui/mactextwindow.cpp +++ b/graphics/macgui/mactextwindow.cpp @@ -100,6 +100,8 @@ void MacTextWindow::setTextWindowFont(const MacFont *font) { _font = font; _fontRef = _wm->_fontMan->getFont(*font); + + _mactext->setDefaultFormatting(font->getId(), font->getSlant(), font->getSize(), 0, 0, 0); } const MacFont *MacTextWindow::getTextWindowFont() { |