[Scummvm-git-logs] scummvm master -> 1c6b31397a382e4adb315456a321caf144766826

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0691c4e82e GRAPHICS: Pass MacWindowManager to MacText constructor
1c6b31397a GRAPHICS: Added MacFontRun structure


Commit: 0691c4e82e16467f4d7c669a4a9c12a7d48a4301
    https://github.com/scummvm/scummvm/commit/0691c4e82e16467f4d7c669a4a9c12a7d48a4301
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-01-29T14:19:28+01:00

Commit Message:
GRAPHICS: Pass MacWindowManager to MacText constructor

Changed paths:
    engines/director/frame.cpp
    graphics/macgui/mactext.cpp
    graphics/macgui/mactext.h


diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index e47214d..d1a55fd 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 208307e..ae233d5 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 28f0e50..2fcf26f 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;


Commit: 1c6b31397a382e4adb315456a321caf144766826
    https://github.com/scummvm/scummvm/commit/1c6b31397a382e4adb315456a321caf144766826
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-01-29T14:31:38+01:00

Commit Message:
GRAPHICS: Added MacFontRun structure

Changed paths:
    graphics/macgui/mactext.h


diff --git a/graphics/macgui/mactext.h b/graphics/macgui/mactext.h
index 2fcf26f..0cef3fb 100644
--- a/graphics/macgui/mactext.h
+++ b/graphics/macgui/mactext.h
@@ -30,6 +30,19 @@
 namespace Graphics {
 
 class MacWindowManager;
+class MacFont;
+
+struct MacFontRun {
+	uint16 fontId;
+	byte textSlant;
+	byte unk3f;
+	uint16 fontSize;
+	uint16 palinfo1;
+	uint16 palinfo2;
+	uint16 palinfo3;
+
+	MacFont *font;
+};
 
 class MacText {
 public: