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

Using PNGs as symbols in some onscreen keyboard keys.

Browse source
This commit is contained in:
Pere Pujal i Carabantes 2014-03-31 13:50:23 +00:00
parent e6365974f6
commit 1dbe751b4e
10 changed files with 82 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/tuxpaint.c
View file

@ -1358,6 +1358,7 @@ static SDL_Surface *img_title_on, *img_title_off,
static SDL_Surface *img_title_names[NUM_TITLES];
static SDL_Surface *img_tools[NUM_TOOLS], *img_tool_names[NUM_TOOLS];
static SDL_Surface *img_oskdel, *img_osktab, *img_oskenter, *img_oskcapslock, *img_oskshift;
static SDL_Surface *thumbnail(SDL_Surface * src, int max_x, int max_y,
int keep_aspect);
static SDL_Surface *thumbnail2(SDL_Surface * src, int max_x, int max_y,
@ -3033,9 +3034,9 @@ static void mainloop(void)
if (kbd == NULL)
{
if (onscreen_keyboard_layout)
kbd = osk_create(onscreen_keyboard_layout, screen, img_btnsm_up, img_btnsm_down, img_btnsm_off, img_btnsm_nav, img_btnsm_hold, onscreen_keyboard_disable_change);
kbd = osk_create(onscreen_keyboard_layout, screen, img_btnsm_up, img_btnsm_down, img_btnsm_off, img_btnsm_nav, img_btnsm_hold, img_oskdel, img_osktab, img_oskenter, img_oskcapslock, img_oskshift, onscreen_keyboard_disable_change);
else
kbd = osk_create(strdup("default.layout"), screen, img_btnsm_up, img_btnsm_down, img_btnsm_off, img_btnsm_nav, img_btnsm_hold, onscreen_keyboard_disable_change);
kbd = osk_create(strdup("default.layout"), screen, img_btnsm_up, img_btnsm_down, img_btnsm_off, img_btnsm_nav, img_btnsm_hold, img_oskdel, img_osktab, img_oskenter, img_oskcapslock, img_oskshift, onscreen_keyboard_disable_change);
}
if (kbd == NULL)
printf("kbd = NULL\n");
@ -12199,6 +12200,15 @@ static void cleanup(void)
free(img_color_btns);
#endif
if (onscreen_keyboard)
{
free_surface(&img_oskdel);
free_surface(&img_osktab);
free_surface(&img_oskenter);
free_surface(&img_oskcapslock);
free_surface(&img_oskshift);
}
free_surface(&screen);
free_surface(&img_starter);
free_surface(&img_starter_bkgd);
@ -23143,6 +23153,15 @@ static void setup(void)
img_paintcan = loadimage(DATA_PREFIX "images/ui/paintcan.png");
#endif
if (onscreen_keyboard)
{
img_oskdel = loadimage(DATA_PREFIX "images/ui/osk_delete.png");
img_osktab = loadimage(DATA_PREFIX "images/ui/osk_tab.png");
img_oskenter = loadimage(DATA_PREFIX "images/ui/osk_enter.png");
img_oskcapslock = loadimage(DATA_PREFIX "images/ui/osk_capslock.png");
img_oskshift = loadimage(DATA_PREFIX "images/ui/osk_shift.png");
}
show_progress_bar(screen);