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

Fixed palette offset bug introduced when moving white to beginning of

Browse source 
colors in "New" dialog. (AKA: I was only half done implementing it.)
Cleaned up and greyscaled a bunch of Magic Tool icons (for consistency).
This commit is contained in:
William Kendrick 2009-01-31 00:32:26 +00:00
parent 1b0b307852
commit ded6cd0d29
27 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/tuxpaint.c
View file

@ -17730,6 +17730,7 @@ int do_new_dialog(void)
int first_starter;
int added;
Uint8 r, g, b;
int white_in_palette;
do_setcursor(cursor_watch);
@ -17829,6 +17830,8 @@ int do_new_dialog(void)
/* Throw the color palette at the beginning: */
white_in_palette = -1;
for (j = -1; j < NUM_COLORS; j++)
{
added = 0;
@ -17866,6 +17869,10 @@ int do_new_dialog(void)
added = 1;
}
}
else
{
white_in_palette = j;
}
}
else
{
@ -18630,10 +18637,23 @@ int do_new_dialog(void)
/* FIXME: Don't do anything and go back to Open dialog if they
hit BACK in color picker! */
canvas_color_r = color_hexes[which][0];
canvas_color_g = color_hexes[which][1];
canvas_color_b = color_hexes[which][2];
if (which == 0) /* White */
{
canvas_color_r = canvas_color_g = canvas_color_b = 255;
}
else if (which <= white_in_palette) /* One of the colors before white in the pallete */
{
canvas_color_r = color_hexes[which - 1][0];
canvas_color_g = color_hexes[which - 1][1];
canvas_color_b = color_hexes[which - 1][2];
}
else
{
canvas_color_r = color_hexes[which][0];
canvas_color_g = color_hexes[which][1];
canvas_color_b = color_hexes[which][2];
}
SDL_FillRect(canvas, NULL, SDL_MapRGB(canvas->format,
canvas_color_r,
canvas_color_g,