aboutsummaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorVelocityRa2017-04-04 02:10:49 +0300
committerEugene Sandulenko2017-07-17 23:45:22 +0200
commita169c7efb3c80dafc9cfc2dccf2c31fcffe5be11 (patch)
tree0408d07fc043d4dd7326cdb3b18034668aa3a3c0 /graphics
parent2b06c02d7deb866138ff6fa8f469d48313d9afbd (diff)
downloadscummvm-rg350-a169c7efb3c80dafc9cfc2dccf2c31fcffe5be11.tar.gz
scummvm-rg350-a169c7efb3c80dafc9cfc2dccf2c31fcffe5be11.tar.bz2
scummvm-rg350-a169c7efb3c80dafc9cfc2dccf2c31fcffe5be11.zip
GRAPHICS: Use MacText::appendText to render formatted text
With this we can specify font, character size and slant that each appended text will use.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/macgui/mactextwindow.cpp4
-rw-r--r--graphics/macgui/mactextwindow.h3
2 files changed, 4 insertions, 3 deletions
diff --git a/graphics/macgui/mactextwindow.cpp b/graphics/macgui/mactextwindow.cpp
index ba2b9fa0ca..22bd2407de 100644
--- a/graphics/macgui/mactextwindow.cpp
+++ b/graphics/macgui/mactextwindow.cpp
@@ -41,8 +41,8 @@ void MacTextWindow::drawText(ManagedSurface *g, int x, int y, int w, int h, int
_mactext->draw(g, x, y, w, h, xoff, yoff);
}
-void MacTextWindow::appendText(Common::String str) {
- _mactext->appendText(str);
+void MacTextWindow::appendText(Common::String str, int id, int size, int slant) {
+ _mactext->appendText(str, id, size, slant);
}
MacTextWindow::~MacTextWindow() {
diff --git a/graphics/macgui/mactextwindow.h b/graphics/macgui/mactextwindow.h
index 6ca6e9a9af..3ef928eab9 100644
--- a/graphics/macgui/mactextwindow.h
+++ b/graphics/macgui/mactextwindow.h
@@ -23,6 +23,7 @@
#ifndef GRAPHICS_MACGUI_MACTEXTWINDOW_H
#define GRAPHICS_MACGUI_MACTEXTWINDOW_H
+#include "graphics/macgui/macfontmanager.h"
#include "graphics/macgui/mactext.h"
namespace Graphics {
@@ -36,7 +37,7 @@ public:
const Font *getTextWindowFont();
void drawText(ManagedSurface *g, int x, int y, int w, int h, int xoff, int yoff);
- void appendText(Common::String str);
+ void appendText(Common::String str, int fontId = kMacFontChicago, int fontSize = 12, int fontSlant = kMacFontRegular);
private:
MacText *_mactext;