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

Trial to make ui font fallback enable when no config option specified.

Browse source
This commit is contained in:
dolphin6k 2023-07-02 18:05:42 +09:00
parent d271c5ba42
commit 17a0a59a50
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/tuxpaint.c
View file

@ -28082,12 +28082,12 @@ static void setup_config(char *argv[])
tp_ui_font_fallback = NULL; tp_ui_font_fallback = NULL;
if (tmpcfg.tp_ui_font)
{
char * tmp_str; char * tmp_str;
FcBool fontAddStatus; FcBool fontAddStatus;
char locale_fontdir[MAX_PATH]; char locale_fontdir[MAX_PATH];
if (tmpcfg.tp_ui_font)
{
if (strcmp(tmpcfg.tp_ui_font, "default") == 0) if (strcmp(tmpcfg.tp_ui_font, "default") == 0)
{ {
printf/*DEBUG_PRINTF*/("Requested default UI font, \"%s\"\n", PANGO_DEFAULT_FONT); printf/*DEBUG_PRINTF*/("Requested default UI font, \"%s\"\n", PANGO_DEFAULT_FONT);
@ -28102,6 +28102,15 @@ static void setup_config(char *argv[])
tp_ui_font = strdup(tmpcfg.tp_ui_font); tp_ui_font = strdup(tmpcfg.tp_ui_font);
printf/*DEBUG_PRINTF*/("Requested UI font described by \"%s\"\n", tp_ui_font); printf/*DEBUG_PRINTF*/("Requested UI font described by \"%s\"\n", tp_ui_font);
} }
}
else{
printf/*DEBUG_PRINTF*/("Requested default UI font, \"%s\"\n", PANGO_DEFAULT_FONT);
tp_ui_font = strdup(PANGO_DEFAULT_FONT);
if (PANGO_DEFAULT_FONT_FALLBACK != NULL)
{
tp_ui_font_fallback = strdup(PANGO_DEFAULT_FONT_FALLBACK);
}
}
/* Add Tux Paint's own set of fonts to FontConfig, /* Add Tux Paint's own set of fonts to FontConfig,
so SDL2_Pango can find and use them */ so SDL2_Pango can find and use them */
@ -28156,11 +28165,6 @@ static void setup_config(char *argv[])
{ {
printf("Error asking pango for actual font!\n"); printf("Error asking pango for actual font!\n");
} }
}
else
{
tp_ui_font = strdup(PANGO_DEFAULT_FONT);
}
/* FIXME: most of this is not required before starting the font scanner */ /* FIXME: most of this is not required before starting the font scanner */