aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2018-11-09 19:26:34 -0800
committerPaul Gilbert2018-11-14 19:00:17 -0800
commite5b73b28998330af5ed0062b2ae4d49655246e93 (patch)
tree20e49611d2ff269ce5df4b1e0090e23f9acca336
parentc1bd6a250d728912b5cacdbdd247f6107d18c6ad (diff)
downloadscummvm-rg350-e5b73b28998330af5ed0062b2ae4d49655246e93.tar.gz
scummvm-rg350-e5b73b28998330af5ed0062b2ae4d49655246e93.tar.bz2
scummvm-rg350-e5b73b28998330af5ed0062b2ae4d49655246e93.zip
GRAPHICS: Add deltax optional parameter to Font drawString U32String version
-rw-r--r--graphics/font.cpp8
-rw-r--r--graphics/font.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/graphics/font.cpp b/graphics/font.cpp
index 5f1e68c4f2..32d2852b89 100644
--- a/graphics/font.cpp
+++ b/graphics/font.cpp
@@ -300,8 +300,8 @@ void Font::drawString(Surface *dst, const Common::String &str, int x, int y, int
drawStringImpl(*this, dst, renderStr, x, y, w, color, align, deltax);
}
-void Font::drawString(Surface *dst, const Common::U32String &str, int x, int y, int w, uint32 color, TextAlign align) const {
- drawStringImpl(*this, dst, str, x, y, w, color, align, 0);
+void Font::drawString(Surface *dst, const Common::U32String &str, int x, int y, int w, uint32 color, TextAlign align, int deltax) const {
+ drawStringImpl(*this, dst, str, x, y, w, color, align, deltax);
}
void Font::drawString(ManagedSurface *dst, const Common::String &str, int x, int y, int w, uint32 color, TextAlign align, int deltax, bool useEllipsis) const {
@@ -311,8 +311,8 @@ void Font::drawString(ManagedSurface *dst, const Common::String &str, int x, int
}
}
-void Font::drawString(ManagedSurface *dst, const Common::U32String &str, int x, int y, int w, uint32 color, TextAlign align) const {
- drawString(&dst->_innerSurface, str, x, y, w, color, align);
+void Font::drawString(ManagedSurface *dst, const Common::U32String &str, int x, int y, int w, uint32 color, TextAlign align, int deltax) const {
+ drawString(&dst->_innerSurface, str, x, y, w, color, align, deltax);
if (w != 0) {
dst->addDirtyRect(getBoundingBox(str, x, y, w, align));
}
diff --git a/graphics/font.h b/graphics/font.h
index 6682ce015b..48330dedfa 100644
--- a/graphics/font.h
+++ b/graphics/font.h
@@ -146,9 +146,9 @@ public:
// TODO: Add doxygen comments to this
void drawString(Surface *dst, const Common::String &str, int x, int y, int w, uint32 color, TextAlign align = kTextAlignLeft, int deltax = 0, bool useEllipsis = true) const;
- void drawString(Surface *dst, const Common::U32String &str, int x, int y, int w, uint32 color, TextAlign align = kTextAlignLeft) const;
+ void drawString(Surface *dst, const Common::U32String &str, int x, int y, int w, uint32 color, TextAlign align = kTextAlignLeft, int deltax = 0) const;
void drawString(ManagedSurface *dst, const Common::String &str, int x, int y, int w, uint32 color, TextAlign align = kTextAlignLeft, int deltax = 0, bool useEllipsis = true) const;
- void drawString(ManagedSurface *dst, const Common::U32String &str, int x, int y, int w, uint32 color, TextAlign align = kTextAlignLeft) const;
+ void drawString(ManagedSurface *dst, const Common::U32String &str, int x, int y, int w, uint32 color, TextAlign align = kTextAlignLeft, int deltax = 0) const;
/**
* Compute and return the width the string str has when rendered using this font.