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

Label->Apply->final label: Update screen correctly

Browse source
This commit is contained in:
Bill Kendrick 2022-02-21 23:59:51 -08:00
parent a095d89ff2
commit 380e5455f9
2 changed files with 35 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/CHANGES.txt
View file

@ -70,7 +70,7 @@ http://www.tuxpaint.org/
(h/t Anat Caspi) (h/t Anat Caspi)
Bill Kendrick <bill@newbreedsoftware.com> Bill Kendrick <bill@newbreedsoftware.com>
* WIP "Label" tool now offers a way to "apply" a label to the canvas * "Label" tool now offers a way to "apply" a label to the canvas
(as if it were 'painted' onto the drawing with the "Text" tool). (as if it were 'painted' onto the drawing with the "Text" tool).
Closes https://sourceforge.net/p/tuxpaint/feature-requests/213/ Closes https://sourceforge.net/p/tuxpaint/feature-requests/213/
Bill Kendrick <bill@newbreedsoftware.com> Bill Kendrick <bill@newbreedsoftware.com>

52
src/tuxpaint.c
View file

@ -24299,20 +24299,26 @@ static void cycle_highlighted_label_node()
{ {
aux_node = highlighted_label_node->next_to_down_label_node; aux_node = highlighted_label_node->next_to_down_label_node;
if (aux_node == NULL) if (aux_node == NULL)
aux_node = current_label_node; {
if (aux_node->is_enabled) aux_node = current_label_node;
highlighted_label_node = aux_node; }
else
while (aux_node->is_enabled == FALSE && aux_node != highlighted_label_node)
{
aux_node = aux_node->next_to_down_label_node;
if (aux_node == NULL)
aux_node = current_label_node;
if (aux_node->is_enabled)
highlighted_label_node = aux_node;
}
}
if (aux_node->is_enabled)
{
highlighted_label_node = aux_node;
}
else
{
while (aux_node->is_enabled == FALSE && aux_node != highlighted_label_node)
{
aux_node = aux_node->next_to_down_label_node;
if (aux_node == NULL)
aux_node = current_label_node;
if (aux_node->is_enabled)
highlighted_label_node = aux_node;
}
}
}
} }
/** /**
@ -28443,33 +28449,40 @@ static void apply_label_node(int old_x, int old_y) {
cursor_left = old_x; cursor_left = old_x;
SDL_Rect rect; SDL_Rect rect;
/* Capture into Undo buffer */
rec_undo_buffer(); rec_undo_buffer();
/* Apply the text the canvas */
do_render_cur_text(1); do_render_cur_text(1);
draw_fonts(); /* Switch to normal label adding mode;
update_screen_rect(&r_toolopt); Update label control buttons */
cur_label = LABEL_LABEL; cur_label = LABEL_LABEL;
draw_colors(COLORSEL_REFRESH); draw_colors(COLORSEL_REFRESH);
draw_fonts(); draw_fonts();
update_screen_rect(&r_toolopt);
have_to_rec_label_node = TRUE; have_to_rec_label_node = TRUE;
/* [Best way to explain this?] */
rect.x = label_node_to_edit->save_x; rect.x = label_node_to_edit->save_x;
rect.y = label_node_to_edit->save_y; rect.y = label_node_to_edit->save_y;
rect.w = label_node_to_edit->save_width; rect.w = label_node_to_edit->save_width;
rect.w = label_node_to_edit->save_height; rect.h = label_node_to_edit->save_height;
SDL_BlitSurface( label_node_to_edit->label_node_surface, NULL, canvas, &rect); SDL_BlitSurface(label_node_to_edit->label_node_surface, NULL, canvas, &rect);
label_node_to_edit->is_enabled = FALSE; label_node_to_edit->is_enabled = FALSE;
/* [Best way to explain this?] */
add_label_node(0, 0, 0, 0, NULL); add_label_node(0, 0, 0, 0, NULL);
derender_node(&label_node_to_edit); derender_node(&label_node_to_edit);
label_node_to_edit = NULL; label_node_to_edit = NULL;
/* [Best way to explain this?] */
texttool_len = 0; texttool_len = 0;
cursor_textwidth = 0; cursor_textwidth = 0;
/* Make "Save" button available after this change (if appropriate) */
if (been_saved) if (been_saved)
{ {
been_saved = 0; been_saved = 0;
@ -28481,6 +28494,9 @@ static void apply_label_node(int old_x, int old_y) {
update_screen_rect(&r_tools); update_screen_rect(&r_tools);
} }
/* Back to normal "how to use Label tool" tip; play sound */
update_canvas_ex_r(rect.x, rect.y, rect.w, rect.h, 1);
draw_tux_text(TUX_GREAT, tool_tips[TOOL_LABEL], 1); draw_tux_text(TUX_GREAT, tool_tips[TOOL_LABEL], 1);
playsound(screen, 1, SND_RETURN, 1, cursor_x, SNDDIST_NEAR); playsound(screen, 1, SND_RETURN, 1, cursor_x, SNDDIST_NEAR);
} }