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

Adding Android paths to onscreen keyboard.

Browse source 
Tux Paint would crash if the Android builds try to use the onscreen keyboards we provide.
This commit is contained in:
Pere Pujal i Carabantes 2023-03-23 09:24:21 +01:00
parent 5a5f08be29
commit 59d42b091a
1 changed files with 23 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/onscreen_keyboard.c
View file

@ -1166,6 +1166,20 @@ static void keybd_prepare(on_screen_keyboard * keyboard)
snprintf(fontname, 255, "%s/fonts/locale/%s", DATA_PREFIX, snprintf(fontname, 255, "%s/fonts/locale/%s", DATA_PREFIX,
keyboard->layout->fontpath); keyboard->layout->fontpath);
keyboard->osk_fonty = TTF_OpenFont(fontname, font_height); keyboard->osk_fonty = TTF_OpenFont(fontname, font_height);
if (keyboard->osk_fonty == NULL)
{
/* Fonts are in assets "data" dir in Android builds */
snprintf(fontname, 255, "data/fonts/%s",
keyboard->layout->fontpath);
keyboard->osk_fonty = TTF_OpenFont(fontname, font_height);
if (keyboard->osk_fonty == NULL)
{
/* Fonts are in assets "data" dir in Android builds, checking locale dir */
snprintf(fontname, 255, "data/fonts/locale/%s",
keyboard->layout->fontpath);
keyboard->osk_fonty = TTF_OpenFont(fontname, font_height);
}
}
} }
} }
} }
@ -1176,6 +1190,13 @@ static void keybd_prepare(on_screen_keyboard * keyboard)
/* Going with the default */ /* Going with the default */
sprintf(fontname, "%s/fonts/FreeSansBold.ttf", DATA_PREFIX); sprintf(fontname, "%s/fonts/FreeSansBold.ttf", DATA_PREFIX);
keyboard->osk_fonty = TTF_OpenFont(fontname, font_height); keyboard->osk_fonty = TTF_OpenFont(fontname, font_height);
if (keyboard->osk_fonty == NULL)
{
/* Also for Android */
sprintf(fontname, "data/fonts/FreeSansBold.ttf");
keyboard->osk_fonty = TTF_OpenFont(fontname, font_height);
}
} }
if (keyboard->osk_fonty == NULL) if (keyboard->osk_fonty == NULL)