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

Merge branch 'master' into sdl2.0

Browse source 
Catching up with latest devel
Still things to solve/do:
Apply label seems to not work, neither in master
Onscreen keyboard size doesn't perform as in master
Test on other OSs, Windows, Android, ...
This commit is contained in:
Pere Pujal i Carabantes 2022-02-18 00:29:40 +01:00
commit b7414433cb
47 changed files with 448 additions and 967 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/fonts.c
View file

@ -961,6 +961,8 @@ static void loadfonts_locale_filter(SDL_Surface * screen, SDL_Texture * texture,
char buf[TP_FTW_PATHSIZE];
unsigned dirlen = strlen(dir);
DEBUG_PRINTF("Loading fonts from [%s]\n", dir);
memcpy(buf, dir, dirlen);
tp_ftw(screen, texture, renderer, buf, dirlen, 1, loadfont_callback, locale);
}
@ -1039,6 +1041,15 @@ static void loadfonts(SDL_Surface * screen, SDL_Texture * texture, SDL_Renderer
free(homedirdir);
#endif
#ifdef __APPLE__
homedirdir = malloc(snprintf(NULL, 0, "%s/fonts", apple_globalPreferencesPath()) + 1);
if(homedirdir) {
sprintf(homedirdir, "%s/fonts", apple_globalPreferencesPath());
loadfonts(screen, homedirdir);
free(homedirdir);
}
#endif
#ifdef DEBUG
printf("%s:%d - Grouping %d fonts...\n", __FILE__, __LINE__, num_font_styles);
fflush(stdout);