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

Removing unused stuff.

Browse source
This commit is contained in:
Pere Pujal i Carabantes 2014-04-20 23:19:55 +00:00
parent a04319ed57
commit 25e582c438
1 changed files with 0 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/onscreen_keyboard.c
View file

@ -6,8 +6,6 @@
//#define DEBUG_OSK_COMPOSEMAP
static TTF_Font * osk_fonty;
static TTF_Font * osk_fonty10;
static TTF_Font * osk_fonty8;
static SDL_Color def_bgcolor = {255, 255, 255, 255};
static SDL_Color def_fgcolor = {0, 0, 0, 0};
@ -995,30 +993,22 @@ static void keybd_prepare(on_screen_keyboard *keyboard)
{
/* First try if it is an absolute path */
osk_fonty = TTF_OpenFont( keyboard->layout->fontpath, 12 );
osk_fonty10 = TTF_OpenFont( keyboard->layout->fontpath, 10 );
osk_fonty8 = TTF_OpenFont( keyboard->layout->fontpath, 8 );
if (osk_fonty == NULL)
{
/* Now trying if it is relative to DATA_PREFIX/fonts/ */
snprintf(fontname, 255, "%s/fonts/%s", DATA_PREFIX, keyboard->layout->fontpath);
osk_fonty = TTF_OpenFont( fontname, 12 );
osk_fonty10 = TTF_OpenFont( fontname, 10 );
osk_fonty8 = TTF_OpenFont( fontname, 8 );
if (osk_fonty == NULL)
{
/* Perhaps it is relative to DATA_PREFIX only? */
snprintf(fontname, 255, "%s/%s", DATA_PREFIX, keyboard->layout->fontpath);
osk_fonty = TTF_OpenFont( fontname, 12 );
osk_fonty10 = TTF_OpenFont( fontname, 10 );
osk_fonty8 = TTF_OpenFont( fontname, 8 );
if (osk_fonty == NULL)
{
/* Or to DATA_PREFIX/fonts/locale/ ? */
snprintf(fontname, 255, "%s/fonts/locale/%s", DATA_PREFIX, keyboard->layout->fontpath);
osk_fonty = TTF_OpenFont( fontname, 12 );
osk_fonty10 = TTF_OpenFont( fontname, 10 );
osk_fonty8 = TTF_OpenFont( fontname, 8 );
}
}
}
@ -1029,8 +1019,6 @@ static void keybd_prepare(on_screen_keyboard *keyboard)
/* Going with the default */
sprintf(fontname, "%s/fonts/FreeSansBold.ttf", DATA_PREFIX);
osk_fonty = TTF_OpenFont( fontname, 12 );
osk_fonty10 = TTF_OpenFont( fontname, 10 );
osk_fonty8 = TTF_OpenFont( fontname, 8 );
}
if (osk_fonty == NULL)