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

Any current text being written in the Text tool is applied to the picture

Browse source 
if 'Print' is clicked. (Useful if kids are told to add their name to a picture
when they're done, right before printing, but they forget to hit [Enter].)
This commit is contained in:
William Kendrick 2007-10-25 15:23:20 +00:00
parent 6a36f74721
commit fa99f6cbd0
3 changed files with 28 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -7,12 +7,12 @@
# bill@newbreedsoftware.com # bill@newbreedsoftware.com
# http://www.tuxpaint.org/ # http://www.tuxpaint.org/
# June 14, 2002 - Octobr 23, 2007 # June 14, 2002 - Octobr 25, 2007
# The version number, for release: # The version number, for release:
VER_VERSION=0.9.18rc2 VER_VERSION=0.9.18rc3
VER_DATE=`date +"%Y-%m-%d"` VER_DATE=`date +"%Y-%m-%d"`
MAGIC_API_VERSION=0x00000001 MAGIC_API_VERSION=0x00000001

7
docs/CHANGES.txt
View file

@ -9,7 +9,7 @@ http://www.tuxpaint.org/
$Id$ $Id$
2007.October.24 (0.9.18) 2007.October.25 (0.9.18)
* Interface Improvements: * Interface Improvements:
----------------------- -----------------------
* Improved 'New' and 'Open' interface: * Improved 'New' and 'Open' interface:
@ -38,6 +38,11 @@ $Id$
Use "_flip.png"/"_flip.svg" and "_mirror_flip.png"/"_mirror_flip.png", Use "_flip.png"/"_flip.svg" and "_mirror_flip.png"/"_mirror_flip.png",
respectively. respectively.
* Any current text being written in the Text tool is applied to the
picture if 'Print' is clicked.
(Useful if kids are told to add their name to a picture when they're
done, right before printing, but they forget to hit [Enter].)
* Documentation Improvements: * Documentation Improvements:
--------------------------- ---------------------------
* Improved --usage output. * Improved --usage output.

23
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 23, 2007 June 14, 2002 - October 25, 2007
$Id$ $Id$
*/ */
@ -2100,6 +2100,16 @@ static void mainloop(void)
else if (key == SDLK_p && (mod & KMOD_CTRL) && !noshortcuts) else if (key == SDLK_p && (mod & KMOD_CTRL) && !noshortcuts)
{ {
/* Ctrl-P - Print */ /* Ctrl-P - Print */
/* If they haven't hit [Enter], but clicked 'Print', add their text now -bjk 2007.10.25 */
if (cur_tool == TOOL_TEXT && texttool_len > 0)
{
rec_undo_buffer();
do_render_cur_text(1);
texttool_len = 0;
cursor_textwidth = 0;
}
print_image(); print_image();
draw_toolbar(); draw_toolbar();
draw_tux_text(TUX_BORED, "", 0); draw_tux_text(TUX_BORED, "", 0);
@ -2547,11 +2557,18 @@ static void mainloop(void)
} }
else if (cur_tool == TOOL_PRINT) else if (cur_tool == TOOL_PRINT)
{ {
/* If they haven't hit [Enter], but clicked 'Print', add their text now -bjk 2007.10.25 */
if (old_tool == TOOL_TEXT && texttool_len > 0)
{
rec_undo_buffer();
do_render_cur_text(1);
texttool_len = 0;
cursor_textwidth = 0;
}
// original print code was here // original print code was here
print_image(); print_image();
if (old_tool == TOOL_TEXT)
do_render_cur_text(0);
cur_tool = old_tool; cur_tool = old_tool;
draw_toolbar(); draw_toolbar();
draw_tux_text(TUX_BORED, "", 0); draw_tux_text(TUX_BORED, "", 0);