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

make load_locale_font take a size argument

Browse source
This commit is contained in:
Albert Cahalan 2004-12-29 04:05:55 +00:00
parent 6fe421ba32
commit 3b78b50124
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/tuxpaint.c
View file

@ -1037,7 +1037,7 @@ static void do_locale_option(const char * const arg)
} }
static TTF_Font *try_alternate_font(void) static TTF_Font *try_alternate_font(int size)
{ {
char str[128]; char str[128];
char prefix[64]; char prefix[64];
@ -1050,13 +1050,13 @@ static TTF_Font *try_alternate_font(void)
snprintf(str, sizeof(str), "%sfonts/locale/%s.ttf", snprintf(str, sizeof(str), "%sfonts/locale/%s.ttf",
DATA_PREFIX, prefix); DATA_PREFIX, prefix);
return TTF_OpenFont(str, 18); return TTF_OpenFont(str, size);
} }
return NULL; return NULL;
} }
static TTF_Font *load_locale_font(TTF_Font *fallback) static TTF_Font *load_locale_font(TTF_Font *fallback, int size)
{ {
TTF_Font *ret = NULL; TTF_Font *ret = NULL;
if (need_own_font) if (need_own_font)
@ -1065,11 +1065,11 @@ static TTF_Font *load_locale_font(TTF_Font *fallback)
snprintf(str, sizeof(str), "%sfonts/locale/%s.ttf", snprintf(str, sizeof(str), "%sfonts/locale/%s.ttf",
DATA_PREFIX, lang_prefix); DATA_PREFIX, lang_prefix);
ret = TTF_OpenFont(str, 18); ret = TTF_OpenFont(str, size);
if (ret == NULL) if (ret == NULL)
{ {
ret = try_alternate_font(); ret = try_alternate_font(size);
if (ret == NULL) if (ret == NULL)
{ {
fprintf(stderr, fprintf(stderr,
@ -6414,7 +6414,7 @@ static void setup(int argc, char * argv[])
} }
locale_font = load_locale_font(font); locale_font = load_locale_font(font,18);
/* Load other available fonts: */ /* Load other available fonts: */