Fixed bug where translated text would revert to English in 'uppercase' mode.
This commit is contained in:
parent
5fd1e0e272
commit
c5d1c075d7
2 changed files with 4 additions and 6 deletions
|
|
@ -27,6 +27,8 @@ http://www.newbreedsoftware.com/tuxpaint/
|
||||||
* Chinese translation update.
|
* Chinese translation update.
|
||||||
Wang Jian <lark@linux.net.cn>
|
Wang Jian <lark@linux.net.cn>
|
||||||
|
|
||||||
|
* Fixed bug where translated text would revert to English in 'uppercase' mode.
|
||||||
|
|
||||||
|
|
||||||
2003.Jun.17 (0.9.11)
|
2003.Jun.17 (0.9.11)
|
||||||
* Windows bugfixes.
|
* Windows bugfixes.
|
||||||
|
|
|
||||||
|
|
@ -2055,7 +2055,7 @@ void mainloop(void)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
draw_tux_text(TUX_GREAT, event.user.data1, 0, 1, 0);
|
draw_tux_text(TUX_GREAT, (char *) event.user.data1, 0, 1, 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
@ -6329,7 +6329,6 @@ void draw_tux_text(int which_tux, char * str, int want_utf8,
|
||||||
{
|
{
|
||||||
SDL_Rect dest;
|
SDL_Rect dest;
|
||||||
SDL_Color black = {0, 0, 0, 0};
|
SDL_Color black = {0, 0, 0, 0};
|
||||||
char * upper_str;
|
|
||||||
|
|
||||||
|
|
||||||
/* Remove any text-changing timer if one is running: */
|
/* Remove any text-changing timer if one is running: */
|
||||||
|
|
@ -6358,15 +6357,12 @@ void draw_tux_text(int which_tux, char * str, int want_utf8,
|
||||||
SDL_BlitSurface(img_tux[which_tux], NULL, screen, &dest);
|
SDL_BlitSurface(img_tux[which_tux], NULL, screen, &dest);
|
||||||
|
|
||||||
|
|
||||||
upper_str = uppercase(str);
|
wordwrap_text(font, str, black,
|
||||||
wordwrap_text(font, upper_str, black,
|
|
||||||
img_tux[which_tux] -> w + 5,
|
img_tux[which_tux] -> w + 5,
|
||||||
(48 * 7) + 40 + 48 + HEIGHTOFFSET + 5,
|
(48 * 7) + 40 + 48 + HEIGHTOFFSET + 5,
|
||||||
WINDOW_WIDTH, want_utf8, force_locale_font,
|
WINDOW_WIDTH, want_utf8, force_locale_font,
|
||||||
want_right_to_left);
|
want_right_to_left);
|
||||||
|
|
||||||
free(upper_str);
|
|
||||||
|
|
||||||
|
|
||||||
/* Update the display: */
|
/* Update the display: */
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue