notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fighting with SDLPango to get right-to-left working, and only when needed.

Browse source
This commit is contained in:
William Kendrick 2007-09-25 15:43:41 +00:00
parent 0094cfcef3
commit 29a8206965
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/tuxpaint.c
View file

@ -7491,10 +7491,6 @@ static void setup(int argc, char *argv[])
locale_font = load_locale_font(medium_font, 18); locale_font = load_locale_font(medium_font, 18);
#ifndef NO_SDLPANGO
if (need_right_to_left)
SDLPango_SetBaseDirection(locale_font->pango_context, SDLPANGO_DIRECTION_RTL);
#endif
#if 0 #if 0
@ -10036,7 +10032,7 @@ static void wordwrap_text_ex(const char *const str, SDL_Color color,
if (strcmp(str, gettext(str)) == 0) if (strcmp(str, gettext(str)) == 0)
{ {
/* String isn't translated! Don't write right-to-left */ /* String isn't translated! Don't write right-to-left, even if our locale is an RTOL language: */
want_right_to_left = 0; want_right_to_left = 0;
} }
@ -10048,10 +10044,17 @@ static void wordwrap_text_ex(const char *const str, SDL_Color color,
SDLPango_SetDefaultColor(myfont->pango_context, &pango_color); SDLPango_SetDefaultColor(myfont->pango_context, &pango_color);
SDLPango_SetMinimumSize(myfont->pango_context, right - left, canvas->h - top); SDLPango_SetMinimumSize(myfont->pango_context, right - left, canvas->h - top);
if (want_right_to_left) if (want_right_to_left && need_right_to_left)
{
SDLPango_SetBaseDirection(locale_font->pango_context, SDLPANGO_DIRECTION_RTL);
SDLPango_SetText_GivenAlignment(myfont->pango_context, gettext(str), -1, SDLPANGO_ALIGN_RIGHT); SDLPango_SetText_GivenAlignment(myfont->pango_context, gettext(str), -1, SDLPANGO_ALIGN_RIGHT);
}
else else
SDLPango_SetText(myfont->pango_context, gettext(str), -1); {
SDLPango_SetBaseDirection(locale_font->pango_context, SDLPANGO_DIRECTION_LTR);
SDLPango_SetText_GivenAlignment(myfont->pango_context, gettext(str), -1, SDLPANGO_ALIGN_LEFT);
}
text = SDLPango_CreateSurfaceDraw(myfont->pango_context); text = SDLPango_CreateSurfaceDraw(myfont->pango_context);
dest.x = left; dest.x = left;