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

Starter foreground remains above painting. Background appears when eraser

Browse source 
is used.  Woo!  Almost done!
This commit is contained in:
William Kendrick 2004-09-15 06:11:19 +00:00
parent 44732279ae
commit adc9c0481f
1 changed files with 37 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/tuxpaint.c
View file

@ -1075,12 +1075,15 @@ void mainloop(void)
PROMPT_NEW_YES, PROMPT_NEW_YES,
PROMPT_NEW_NO)) PROMPT_NEW_NO))
{ {
free_surface(&img_starter);
free_surface(&img_starter_bkgd);
SDL_FillRect(canvas, NULL, SDL_FillRect(canvas, NULL,
SDL_MapRGB(canvas->format, 255, 255, 255)); SDL_MapRGB(canvas->format, 255, 255, 255));
update_canvas(0, 0, update_canvas(0, 0,
WINDOW_WIDTH - 96, WINDOW_WIDTH - 96,
(48 * 7) + 40 + HEIGHTOFFSET); (48 * 7) + 40 + HEIGHTOFFSET);
cur_undo = 0; cur_undo = 0;
oldest_undo = 0; oldest_undo = 0;
newest_undo = 0; newest_undo = 0;
@ -1389,6 +1392,9 @@ void mainloop(void)
PROMPT_NEW_YES, PROMPT_NEW_YES,
PROMPT_NEW_NO)) PROMPT_NEW_NO))
{ {
free_surface(&img_starter);
free_surface(&img_starter_bkgd);
SDL_FillRect(canvas, NULL, SDL_FillRect(canvas, NULL,
SDL_MapRGB(canvas->format, SDL_MapRGB(canvas->format,
255, 255, 255)); 255, 255, 255));
@ -3674,6 +3680,18 @@ void update_canvas(int x1, int y1, int x2, int y2)
{ {
SDL_Rect dest; SDL_Rect dest;
if (img_starter != NULL)
{
/* If there was a starter, cover this part of the drawing with
the corresponding part of the starter's foreground! */
dest.x = x1;
dest.y = y1;
dest.w = x2 - x1 + 1;
dest.h = y2 - y1 + 1;
SDL_BlitSurface(img_starter, &dest, canvas, &dest);
}
dest.x = 96; dest.x = 96;
dest.y = 0; dest.y = 0;
SDL_BlitSurface(canvas, NULL, screen, &dest); SDL_BlitSurface(canvas, NULL, screen, &dest);
@ -7263,8 +7281,15 @@ void do_eraser(int x, int y)
dest.w = 96; dest.w = 96;
dest.h = 96; dest.h = 96;
SDL_FillRect(canvas, &dest, if (img_starter_bkgd == NULL)
SDL_MapRGB(canvas->format, 255, 255, 255)); {
SDL_FillRect(canvas, &dest,
SDL_MapRGB(canvas->format, 255, 255, 255));
}
else
{
SDL_BlitSurface(img_starter_bkgd, &dest, canvas, &dest);
}
#ifndef NOSOUND #ifndef NOSOUND
@ -10444,6 +10469,9 @@ int do_open(int want_new_tool)
} }
else else
{ {
free_surface(&img_starter);
free_surface(&img_starter_bkgd);
SDL_FillRect(canvas, NULL, SDL_FillRect(canvas, NULL,
SDL_MapRGB(canvas->format, 255, 255, 255)); SDL_MapRGB(canvas->format, 255, 255, 255));
@ -10456,6 +10484,7 @@ int do_open(int want_new_tool)
SDL_BlitSurface(img, NULL, canvas, &dest); SDL_BlitSurface(img, NULL, canvas, &dest);
SDL_FreeSurface(img); SDL_FreeSurface(img);
cur_undo = 0; cur_undo = 0;
oldest_undo = 0; oldest_undo = 0;
newest_undo = 0; newest_undo = 0;
@ -10487,8 +10516,12 @@ int do_open(int want_new_tool)
file_id[0] = '\0'; file_id[0] = '\0';
strcpy(starter_id, d_names[which]); strcpy(starter_id, d_names[which]);
load_starter(starter_id); load_starter(starter_id);
}
SDL_BlitSurface(img_starter_bkgd, NULL, canvas, NULL);
SDL_BlitSurface(img_starter, NULL, canvas, NULL);
}
reset_avail_tools(); reset_avail_tools();
tool_avail[TOOL_NEW] = 1; tool_avail[TOOL_NEW] = 1;
@ -12458,7 +12491,6 @@ void load_starter(char * img_id)
/* Load the core image: */ /* Load the core image: */
snprintf(fname, sizeof(fname), "%s/%s.png", dirname, img_id); snprintf(fname, sizeof(fname), "%s/%s.png", dirname, img_id);
img_starter = IMG_Load(fname); img_starter = IMG_Load(fname);