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

Stamp XORs behaving better with CTRL-key commands, still not finished.

Browse source
This commit is contained in:
Pere Pujal i Carabantes 2022-09-12 02:00:28 +02:00
parent eaba5e94f4
commit 82676e3fb1
1 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/tuxpaint.c
View file

@ -2787,6 +2787,8 @@ static void mainloop(void)
label_node_to_edit = NULL; label_node_to_edit = NULL;
} }
} }
if (cur_tool == TOOL_STAMP)
reset_stamps(&stamp_xored_rt, &stamp_place_x, &stamp_place_y, &stamp_tool_mode);
if (cur_undo == newest_undo) if (cur_undo == newest_undo)
{ {
@ -2808,6 +2810,8 @@ static void mainloop(void)
if (tool_avail[TOOL_REDO]) if (tool_avail[TOOL_REDO])
{ {
if (cur_tool == TOOL_STAMP)
reset_stamps(&stamp_xored_rt, &stamp_place_x, &stamp_place_y, &stamp_tool_mode);
hide_blinking_cursor(); hide_blinking_cursor();
do_redo(); do_redo();
update_screen_rect(&r_tools); update_screen_rect(&r_tools);
@ -2821,6 +2825,8 @@ static void mainloop(void)
/* Ctrl-O - Open */ /* Ctrl-O - Open */
magic_switchout(canvas); magic_switchout(canvas);
if (cur_tool == TOOL_STAMP)
reset_stamps(&stamp_xored_rt, &stamp_place_x, &stamp_place_y, &stamp_tool_mode);
disable_avail_tools(); disable_avail_tools();
draw_toolbar(); draw_toolbar();
@ -2879,6 +2885,8 @@ static void mainloop(void)
/* Ctrl-N - New */ /* Ctrl-N - New */
magic_switchout(canvas); magic_switchout(canvas);
if (cur_tool == TOOL_STAMP)
reset_stamps(&stamp_xored_rt, &stamp_place_x, &stamp_place_y, &stamp_tool_mode);
hide_blinking_cursor(); hide_blinking_cursor();
shape_tool_mode = SHAPE_TOOL_MODE_DONE; shape_tool_mode = SHAPE_TOOL_MODE_DONE;
@ -2940,6 +2948,10 @@ static void mainloop(void)
magic_switchout(canvas); magic_switchout(canvas);
hide_blinking_cursor(); hide_blinking_cursor();
/* Only reset stamp XORs if there will be prompt */
if (cur_tool == TOOL_STAMP && promptless_save == SAVE_OVER_PROMPT && file_id[0] != '\0')
reset_stamps(&stamp_xored_rt, &stamp_place_x, &stamp_place_y, &stamp_tool_mode);
if (do_save(cur_tool, 0, 0)) if (do_save(cur_tool, 0, 0))
{ {
/* Only think it's been saved if it HAS been saved :^) */ /* Only think it's been saved if it HAS been saved :^) */
@ -2981,6 +2993,8 @@ static void mainloop(void)
if (!disable_print) if (!disable_print)
{ {
magic_switchout(canvas); magic_switchout(canvas);
if (cur_tool == TOOL_STAMP)
reset_stamps(&stamp_xored_rt, &stamp_place_x, &stamp_place_y, &stamp_tool_mode);
/* If they haven't hit [Enter], but clicked 'Print', add their text now -bjk 2007.10.25 */ /* If they haven't hit [Enter], but clicked 'Print', add their text now -bjk 2007.10.25 */