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

Making sure labels get _printed_, too.

Browse source
This commit is contained in:
William Kendrick 2009-10-06 18:19:34 +00:00
parent f2473f952b
commit 0233926eb1
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/tuxpaint.c
View file

@ -22,7 +22,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
June 14, 2002 - October 3, 2009 June 14, 2002 - October 6, 2009
$Id$ $Id$
*/ */
@ -13427,14 +13427,14 @@ static int do_save(int tool, int dont_show_success_results)
unsigned i = 0; unsigned i = 0;
int list_ctr = 0; int list_ctr = 0;
int x, y, pix, size_pix; int x, y, pix, size_pix;
SDL_BlitSurface(canvas, NULL, save_canvas, NULL);
SDL_BlitSurface(label, NULL, save_canvas, NULL); /* FIXAM Should we first check for disble_save? */
/* Was saving completely disabled? */ /* Was saving completely disabled? */
if (disable_save) if (disable_save)
return 0; return 0;
SDL_BlitSurface(canvas, NULL, save_canvas, NULL);
SDL_BlitSurface(label, NULL, save_canvas, NULL);
if (promptless_save == SAVE_OVER_NO) if (promptless_save == SAVE_OVER_NO)
{ {
@ -16319,6 +16319,10 @@ static void print_image(void)
void do_print(void) void do_print(void)
{ {
/* Assemble drawing plus any labels: */
SDL_BlitSurface(canvas, NULL, save_canvas, NULL);
SDL_BlitSurface(label, NULL, save_canvas, NULL);
#if !defined(WIN32) && !defined(__BEOS__) && !defined(__APPLE__) #if !defined(WIN32) && !defined(__BEOS__) && !defined(__APPLE__)
char *pcmd; char *pcmd;
FILE *pi; FILE *pi;
@ -16339,13 +16343,13 @@ void do_print(void)
else else
{ {
#ifdef PRINTMETHOD_PNG_PNM_PS #ifdef PRINTMETHOD_PNG_PNM_PS
if (do_png_save(pi, pcmd, canvas)) if (do_png_save(pi, pcmd, save_canvas))
do_prompt_snd(PROMPT_PRINT_TXT, PROMPT_PRINT_YES, "", SND_TUXOK, do_prompt_snd(PROMPT_PRINT_TXT, PROMPT_PRINT_YES, "", SND_TUXOK,
screen->w / 2, screen->h / 2); screen->w / 2, screen->h / 2);
#elif defined(PRINTMETHOD_PNM_PS) #elif defined(PRINTMETHOD_PNM_PS)
/* nothing here */ /* nothing here */
#elif defined(PRINTMETHOD_PS) #elif defined(PRINTMETHOD_PS)
if (do_ps_save(pi, pcmd, canvas, papersize, 1)) if (do_ps_save(pi, pcmd, save_canvas, papersize, 1))
do_prompt_snd(PROMPT_PRINT_TXT, PROMPT_PRINT_YES, "", SND_TUXOK, do_prompt_snd(PROMPT_PRINT_TXT, PROMPT_PRINT_YES, "", SND_TUXOK,
screen->w / 2, screen->h / 2); screen->w / 2, screen->h / 2);
else else
@ -16366,7 +16370,7 @@ void do_print(void)
{ {
const char *error = const char *error =
SurfacePrint(canvas, use_print_config ? f : NULL, show); SurfacePrint(save_canvas, use_print_config ? f : NULL, show);
if (error) if (error)
fprintf(stderr, "%s\n", error); fprintf(stderr, "%s\n", error);
@ -16374,12 +16378,12 @@ void do_print(void)
#elif defined(__BEOS__) #elif defined(__BEOS__)
/* BeOS */ /* BeOS */
SurfacePrint(canvas); SurfacePrint(save_canvas);
#elif defined(__APPLE__) #elif defined(__APPLE__)
/* Mac OS X */ /* Mac OS X */
int show = ( ( want_alt_printcommand || macosx.menuAction ) && !fullscreen); int show = ( ( want_alt_printcommand || macosx.menuAction ) && !fullscreen);
const char *error = SurfacePrint(canvas, show); const char *error = SurfacePrint(save_canvas, show);
if (error) if (error)
{ {