dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r15790) -Codechange: remove the *Centered part of the old text drawing API.

Browse Source
This commit is contained in:
rubidium
2009-03-21 22:00:00 +00:00
parent 25b70e8c0d
commit 89d614deea
15 changed files with 60 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/gfx.cpp
View File

@@ -424,7 +424,7 @@ static int DrawString(int left, int right, int top, char *str, const char *last,
break;
case SA_CENTER:
left += (right - left - w) / 2;
left += (right - left - w + 1) / 2;
right = left + w;
break;
@@ -509,55 +509,6 @@ int DrawStringRightAlignedUnderline(int x, int y, StringID str, TextColour colou
return DrawString(0, x, y, str, colour, SA_RIGHT, true);
}
/**
* Draw string centered.
*
* @param x X position of center of the string
* @param y Y position of center of the string
* @param str String to draw
* @param colour Colour used for drawing the string, see DoDrawString() for details
*/
int DrawStringCentered(int x, int y, StringID str, TextColour colour)
{
char buffer[DRAW_STRING_BUFFER];
GetString(buffer, str, lastof(buffer));
int w = GetStringBoundingBox(buffer).width;
return DrawString(x - w, x + w, y, buffer, lastof(buffer), colour, SA_CENTER);
}
/**
* Draw string centered.
*
* @param x X position of center of the string
* @param y Y position of center of the string
* @param str String to draw
* @param colour Colour used for drawing the string, see DoDrawString() for details
*/
int DoDrawStringCentered(int x, int y, const char *str, TextColour colour)
{
char buffer[DRAW_STRING_BUFFER];
strecpy(buffer, str, lastof(buffer));
int w = GetStringBoundingBox(buffer).width;
return DrawString(x - w, x + w, y, buffer, lastof(buffer), colour, SA_CENTER);
}
/**
* Draw string centered, with additional line underneath it
*
* @param x X position of center of the string
* @param y Y position of center of the string
* @param str String to draw
* @param colour Colour used for drawing the string, see DoDrawString() for details
*/
int DrawStringCenterUnderline(int x, int y, StringID str, TextColour colour)
{
char buffer[DRAW_STRING_BUFFER];
GetString(buffer, str, lastof(buffer));
int w = GetStringBoundingBox(buffer).width;
return DrawString(x - w, y + w, y, buffer, lastof(buffer), colour, SA_CENTER, true);
}
/**
* 'Correct' a string to a maximum length. Longer strings will be cut into
* additional lines at whitespace characters if possible. The string parameter