diff options
| author | Eugene Sandulenko | 2017-01-29 14:19:28 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2017-01-29 14:19:28 +0100 |
| commit | 0691c4e82e16467f4d7c669a4a9c12a7d48a4301 (patch) | |
| tree | bed1008231376274a5f020d145408e2cb2a01bed | |
| parent | f4c3de8da4e21311cd4e3e43c12cd1a44b79f205 (diff) | |
| download | scummvm-rg350-0691c4e82e16467f4d7c669a4a9c12a7d48a4301.tar.gz scummvm-rg350-0691c4e82e16467f4d7c669a4a9c12a7d48a4301.tar.bz2 scummvm-rg350-0691c4e82e16467f4d7c669a4a9c12a7d48a4301.zip | |
GRAPHICS: Pass MacWindowManager to MacText constructor
| -rw-r--r-- | engines/director/frame.cpp | 2 | ||||
| -rw-r--r-- | graphics/macgui/mactext.cpp | 3 | ||||
| -rw-r--r-- | graphics/macgui/mactext.h | 7 |
3 files changed, 9 insertions, 3 deletions
diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp index e47214d703..d1a55fdd1f 100644 --- a/engines/director/frame.cpp +++ b/engines/director/frame.cpp @@ -914,7 +914,7 @@ void Frame::renderText(Graphics::ManagedSurface &surface, uint16 spriteId, Commo else alignment++; - Graphics::MacText mt(ftext, font, 0x00, 0xff, width, (Graphics::TextAlign)alignment); + Graphics::MacText mt(ftext, _vm->_wm, font, 0x00, 0xff, width, (Graphics::TextAlign)alignment); mt.setInterLinear(1); mt.render(); const Graphics::ManagedSurface *textSurface = mt.getSurface(); diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp index 208307eb98..ae233d5c9e 100644 --- a/graphics/macgui/mactext.cpp +++ b/graphics/macgui/mactext.cpp @@ -24,8 +24,9 @@ namespace Graphics { -MacText::MacText(Common::String s, const Graphics::Font *font, int fgcolor, int bgcolor, int maxWidth, TextAlign textAlignment) { +MacText::MacText(Common::String s, MacWindowManager *wm, const Graphics::Font *font, int fgcolor, int bgcolor, int maxWidth, TextAlign textAlignment) { _str = s; + _wm = wm; _font = font; _fgcolor = fgcolor; _bgcolor = bgcolor; diff --git a/graphics/macgui/mactext.h b/graphics/macgui/mactext.h index 28f0e50b76..2fcf26fab9 100644 --- a/graphics/macgui/mactext.h +++ b/graphics/macgui/mactext.h @@ -29,9 +29,12 @@ namespace Graphics { +class MacWindowManager; + class MacText { public: - MacText(Common::String s, const Graphics::Font *font, int fgcolor, int bgcolor, int maxWidth = -1, TextAlign textAlignment = kTextAlignLeft); + MacText(Common::String s, MacWindowManager *wm, const Graphics::Font *font, int fgcolor, int bgcolor, + int maxWidth = -1, TextAlign textAlignment = kTextAlignLeft); void setInterLinear(int interLinear) { _interLinear = interLinear; } @@ -49,6 +52,8 @@ private: void reallocSurface(); private: + MacWindowManager *_wm; + Common::String _str; const Graphics::Font *_font; int _fgcolor, _bgcolor; |