[Scummvm-git-logs] scummvm master -> e5b73b28998330af5ed0062b2ae4d49655246e93

[dreammaster]

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

Summary:
e5b73b2899 GRAPHICS: Add deltax optional parameter to Font drawString U32String version


Commit: e5b73b28998330af5ed0062b2ae4d49655246e93
    https://github.com/scummvm/scummvm/commit/e5b73b28998330af5ed0062b2ae4d49655246e93
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-11-14T19:00:17-08:00

Commit Message:
GRAPHICS: Add deltax optional parameter to Font drawString U32String version

Changed paths:
    graphics/font.cpp
    graphics/font.h


diff --git a/graphics/font.cpp b/graphics/font.cpp
index 5f1e68c..32d2852 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 6682ce0..48330de 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.