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

Use Japanese characters, not "Aa", in font selector when available

Browse source 
Also closes https://sourceforge.net/p/tuxpaint/bugs/266/ by
using code based on Pere's patch.  Thanks to Shin-ichi & Pere!
This commit is contained in:
Bill Kendrick 2022-12-09 22:11:32 -08:00
parent 3e6415e408
commit 1f22332415
3 changed files with 48 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/tuxpaint.c
View file

@ -10813,9 +10813,29 @@ static void draw_fonts(void)
if (font < num_font_families)
{
SDL_Surface *tmp_surf_1;
TuxPaint_Font * fonthandle;
/* Label for 'Letters' buttons (font selector, down the right when the Text tool is being used); used to show the difference between font faces */
tmp_surf_1 = render_text(getfonthandle(font), gettext("Aa"), black);
/* Label for 'Letters' buttons (font selector, down the right when
the Text or Label tool are being used); used to show the difference
between font faces. (We'll decide whether a font is suitable to
use the localized string here, or fallback to "Aa", depending on
whether the two glyphs render the same. i.e., if they both come
back as identical rectangles, we know the font doesn't adequately
support this font.) */
fonthandle = getfonthandle(font);
if (charset_works(fonthandle, gettext("Aa"))) {
/* Use the localized label string (e.g., "あぁ" in Japanese) */
#ifdef DEBUG
printf("Font label '%s' for %s\n", gettext("Aa"), fonthandle->desc);
#endif
tmp_surf_1 = render_text(fonthandle, gettext("Aa"), black);
} else {
/* Fallback; use the latin "Aa" string */
#ifdef DEBUG
printf("Fallback font label 'Aa' for %s\n", fonthandle->desc);
#endif
tmp_surf_1 = render_text(fonthandle, "Aa", black);
}
if (tmp_surf_1 == NULL)
{