# HG changeset patch
# User rubidium <rubidium@openttd.org>
# Date 2009-03-23 14:10:54
# Node ID 58245d5f39af595851fb2c367695c232948d629d
# Parent  9a624bbd8c7a806026f838090628e254a53eee9e

(svn r15832) -Codechange: improve the aligning of right aligned/centered strings

diff --git a/src/gfx.cpp b/src/gfx.cpp
--- a/src/gfx.cpp
+++ b/src/gfx.cpp
@@ -399,18 +399,26 @@ static int DrawString(int left, int righ
 
 	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: