From c9e2e22bc00ae4b3aefa7a46f9170b5dde4378fe Mon Sep 17 00:00:00 2001
From: rubidium <rubidium@openttd.org>
Date: Mon, 23 Mar 2009 14:10:54 +0000
Subject: [PATCH] (svn r15832) -Codechange: improve the aligning of right
 aligned/centered strings

---
 src/gfx.cpp | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/gfx.cpp b/src/gfx.cpp
index 6d6a7342e3..82214aedf8 100644
--- a/src/gfx.cpp
+++ b/src/gfx.cpp
@@ -399,18 +399,26 @@ static int DrawString(int left, int right, int top, char *str, const char *last,
 
 	int w = GetStringBoundingBox(str).width;
 
+	/* right is the right most position to draw on. In this case we want to do
+	 * calculations with the width of the string. In comparison right can be
+	 * seen as lastof(todraw) and width as lengthof(todraw). They differ by 1.
+	 * So most +1/-1 additions are to move from lengthof to 'indices'.
+	 */
 	switch (align) {
 		case SA_LEFT:
-			right = left + w;
+			/* right + 1 = left + w */
+			right = left + w - 1;
 			break;
 
 		case SA_CENTER:
-			left += (right - left - w + 1) / 2;
-			right = left + w;
+			/* The second + 1 is to round to the closest number */
+			left  = (right + 1 + left - w + 1) / 2;
+			/* right + 1 = left + w */
+			right = left + w - 1;
 			break;
 
 		case SA_RIGHT:
-			left = right - w;
+			left = right + 1 - w;
 			break;
 
 		default: