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

Avoid potential crash using HSV color from New dialog

Browse source
This commit is contained in:
Bill Kendrick 2023-12-17 11:46:19 -08:00
parent f88069572c
commit f68909c70e
2 changed files with 32 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/CHANGES.txt
View file

@ -36,6 +36,10 @@ https://tuxpaint.org/
when stamp controls were disabled. when stamp controls were disabled.
Bill Kendrick <bill@newbreedsoftware.com> Bill Kendrick <bill@newbreedsoftware.com>
* Avoid potential crash when choosing rainbow palette Color Picker (HSV)
from "New" dialog.
Bill Kendrick <bill@newbreedsoftware.com>
* Ensuring mouse pointer shape changes to hand when hovering over * Ensuring mouse pointer shape changes to hand when hovering over
control buttons below the scroll-down arrow in the selector area control buttons below the scroll-down arrow in the selector area
(e.g., stamp controls, text styles, etc.) (e.g., stamp controls, text styles, etc.)

56
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 14, 2023 June 14, 2002 - December 17, 2023
*/ */
#include "platform.h" #include "platform.h"
@ -24090,7 +24090,7 @@ static int do_color_picker(int prev_color)
int color_picker_left, color_picker_top; int color_picker_left, color_picker_top;
int color_picker_val_left, color_picker_val_top; int color_picker_val_left, color_picker_val_top;
int prev_color_left, prev_color_top; int prev_color_left, prev_color_top;
int pipette_left, pipette_top; int picker_left, picker_top;
int mixer_left, mixer_top; int mixer_left, mixer_top;
int back_left, back_top, done_left, done_top; int back_left, back_top, done_left, done_top;
SDL_Rect color_example_dest; SDL_Rect color_example_dest;
@ -24254,7 +24254,7 @@ static int do_color_picker(int prev_color)
prev_color_left = r_final.x + r_final.w - (img_back->w + 2) * 3; prev_color_left = r_final.x + r_final.w - (img_back->w + 2) * 3;
prev_color_top = color_picker_top + img_color_picker->h - (img_back->h + 2) * 2; prev_color_top = color_picker_top + img_color_picker->h - (img_back->h + 2) * 2;
if (prev_color != -1 && prev_color < NUM_DEFAULT_COLORS) if (prev_color != -1 && prev_color < NUM_COLORS)
{ {
dest.x = prev_color_left; dest.x = prev_color_left;
dest.y = prev_color_top; dest.y = prev_color_top;
@ -24265,20 +24265,20 @@ static int do_color_picker(int prev_color)
} }
/* (Pipette) */ /* (Picker) */
pipette_left = r_final.x + r_final.w - (img_back->w + 2) * 2; picker_left = r_final.x + r_final.w - (img_back->w + 2) * 2;
pipette_top = color_picker_top + img_color_picker->h - (img_back->h + 2) * 2; picker_top = color_picker_top + img_color_picker->h - (img_back->h + 2) * 2;
dest.x = pipette_left; dest.x = picker_left;
dest.y = pipette_top; dest.y = picker_top;
dest.w = img_back->w; dest.w = img_back->w;
dest.h = img_back->h; dest.h = img_back->h;
draw_color_grab_btn(dest, NUM_DEFAULT_COLORS); draw_color_grab_btn(dest, COLOR_PICKER);
dest.x = pipette_left + (img_back->w - img_color_sel->w) / 2; dest.x = picker_left + (img_back->w - img_color_sel->w) / 2;
dest.y = pipette_top + (img_back->h - img_color_sel->h) / 2; dest.y = picker_top + (img_back->h - img_color_sel->h) / 2;
SDL_BlitSurface(img_color_sel, NULL, screen, &dest); SDL_BlitSurface(img_color_sel, NULL, screen, &dest);
@ -24293,7 +24293,7 @@ static int do_color_picker(int prev_color)
dest.w = img_back->w; dest.w = img_back->w;
dest.h = img_back->h; dest.h = img_back->h;
draw_color_grab_btn(dest, NUM_DEFAULT_COLORS + 2); draw_color_grab_btn(dest, COLOR_MIXER);
dest.x = mixer_left + (img_back->w - img_color_mix->w) / 2; dest.x = mixer_left + (img_back->w - img_color_mix->w) / 2;
dest.y = mixer_top + (img_back->h - img_color_mix->h) / 2; dest.y = mixer_top + (img_back->h - img_color_mix->h) / 2;
@ -24469,11 +24469,11 @@ static int do_color_picker(int prev_color)
event.button.x < prev_color_left + img_back->w && event.button.x < prev_color_left + img_back->w &&
event.button.y >= prev_color_top && event.button.y >= prev_color_top &&
event.button.y < prev_color_top + img_back->h && event.button.y < prev_color_top + img_back->h &&
prev_color != -1 && prev_color < NUM_DEFAULT_COLORS) || prev_color != -1 && prev_color < NUM_COLORS) ||
(event.button.x >= pipette_left && (event.button.x >= picker_left &&
event.button.x < pipette_left + img_back->w && event.button.x < picker_left + img_back->w &&
event.button.y >= pipette_top && event.button.y >= picker_top &&
event.button.y < pipette_top + img_back->h) || event.button.y < picker_top + img_back->h) ||
(event.button.x >= mixer_left && (event.button.x >= mixer_left &&
event.button.x < mixer_left + img_back->w && event.button.x < mixer_left + img_back->w &&
event.button.y >= mixer_top && event.button.y < mixer_top + img_back->h)) event.button.y >= mixer_top && event.button.y < mixer_top + img_back->h))
@ -24488,17 +24488,17 @@ static int do_color_picker(int prev_color)
/* Switch to the chosen bucket color */ /* Switch to the chosen bucket color */
c = prev_color; c = prev_color;
} }
else if (event.button.x >= pipette_left && else if (event.button.x >= picker_left &&
event.button.x < pipette_left + img_back->w && event.button.x < picker_left + img_back->w &&
event.button.y >= pipette_top && event.button.y < pipette_top + img_back->h) event.button.y >= picker_top && event.button.y < picker_top + img_back->h)
{ {
/* Pipette */ /* Picker */
c = NUM_DEFAULT_COLORS; c = COLOR_PICKER;
} }
else else
{ {
/* Mixer */ /* Mixer */
c = NUM_DEFAULT_COLORS + 2; c = COLOR_MIXER;
} }
/* Convert the chosen color to HSV & reposition crosshairs */ /* Convert the chosen color to HSV & reposition crosshairs */
@ -24630,11 +24630,11 @@ static int do_color_picker(int prev_color)
event.button.x < prev_color_left + img_back->w && event.button.x < prev_color_left + img_back->w &&
event.button.y >= prev_color_top && event.button.y >= prev_color_top &&
event.button.y < prev_color_top + img_back->h && event.button.y < prev_color_top + img_back->h &&
prev_color != -1 && prev_color < NUM_DEFAULT_COLORS) || prev_color != -1 && prev_color < NUM_COLORS) ||
(event.button.x >= pipette_left && (event.button.x >= picker_left &&
event.button.x < pipette_left + img_back->w && event.button.x < picker_left + img_back->w &&
event.button.y >= pipette_top && event.button.y >= picker_top &&
event.button.y < pipette_top + img_back->h) || event.button.y < picker_top + img_back->h) ||
(event.button.x >= mixer_left && (event.button.x >= mixer_left &&
event.button.x < mixer_left + img_back->w && event.button.x < mixer_left + img_back->w &&
event.button.y >= mixer_top && event.button.y < mixer_top + img_back->h)) event.button.y >= mixer_top && event.button.y < mixer_top + img_back->h))