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

Color picker -> Back; don't 'forget' old crosshair positions

Browse source
This commit is contained in:
Bill Kendrick 2022-03-02 01:38:04 -08:00
parent 0c858122b5
commit adec3666f0
1 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/tuxpaint.c
View file

@ -21898,6 +21898,13 @@ static int do_color_picker(void)
SDL_Rect r_final;
val_x = val_y = motioner = 0;
valhat_x = valhat_y = hatmotioner = 0;
int old_cp_x, old_cp_y, old_cp_v;
/* Remember old choices, in case we hit [Back] */
old_cp_x = color_picker_x;
old_cp_y = color_picker_y;
old_cp_v = color_picker_v;
hide_blinking_cursor();
@ -22284,10 +22291,9 @@ static int do_color_picker(void)
while (!done);
/* Set the new color: */
if (chose)
{
/* Set the new color: */
SDL_GetRGB(getpixel_img_color_picker(img_color_picker, color_picker_x, color_picker_y), img_color_picker->format, &r, &g, &b);
color_hexes[COLOR_PICKER][0] = r;
@ -22298,6 +22304,13 @@ static int do_color_picker(void)
/* Re-render color picker to show the current color it contains: */
render_color_button(COLOR_PICKER, img_color_picker_thumb, NULL);
}
else
{
/* Set crosshairs to the existing color */
color_picker_x = old_cp_x;
color_picker_y = old_cp_y;
color_picker_v = old_cp_v;
}
/* Remove the prompt: */