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

Now properly previews pre-drawn mirrored stamp, if there is one.

Browse source
This commit is contained in:
William Kendrick 2003-09-29 06:16:13 +00:00
parent 34b9f015a9
commit 2d76cbd06b
1 changed files with 43 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/tuxpaint.c
View file

@ -430,7 +430,8 @@ state_type * state_stamps[MAX_STAMPS];
#ifndef NOSOUND #ifndef NOSOUND
Mix_Chunk * snd_stamps[MAX_STAMPS]; Mix_Chunk * snd_stamps[MAX_STAMPS];
#endif #endif
SDL_Surface * img_stamp_thumbs[MAX_STAMPS]; SDL_Surface * img_stamp_thumbs[MAX_STAMPS],
* img_stamp_thumbs_premirror[MAX_STAMPS];
SDL_Surface * img_shapes[NUM_SHAPES], * img_shape_names[NUM_SHAPES]; SDL_Surface * img_shapes[NUM_SHAPES], * img_shape_names[NUM_SHAPES];
SDL_Surface * img_magics[NUM_MAGICS], * img_magic_names[NUM_MAGICS]; SDL_Surface * img_magics[NUM_MAGICS], * img_magic_names[NUM_MAGICS];
@ -4933,6 +4934,27 @@ void setup(int argc, char * argv[])
img_stamp_thumbs[i] = NULL; img_stamp_thumbs[i] = NULL;
} }
if (img_stamps_premirror[i] != NULL && !disable_stamp_controls)
{
/* Also thumbnail the pre-drawn mirror version, if any: */
if (img_stamps_premirror[i]->w > 40 ||
img_stamps_premirror[i]->h > 40)
{
img_stamp_thumbs_premirror[i] =
thumbnail(img_stamps_premirror[i], 40, 40, 1);
}
else
{
img_stamp_thumbs_premirror[i] = NULL;
}
}
else
{
img_stamps_premirror[i] = NULL;
}
state_stamps[i] = malloc(sizeof(state_type)); state_stamps[i] = malloc(sizeof(state_type));
if (inf_stamps[i] == NULL) if (inf_stamps[i] == NULL)
@ -5854,10 +5876,25 @@ void draw_stamps(void)
{ {
/* Draw the stamp itself: */ /* Draw the stamp itself: */
if (img_stamp_thumbs[stamp] != NULL) if (state_stamps[stamp]->mirrored &&
img = img_stamp_thumbs[stamp]; img_stamps_premirror[stamp] != NULL)
{
/* Use pre-drawn mirrored version! */
if (img_stamp_thumbs_premirror[stamp] != NULL)
img = img_stamp_thumbs_premirror[stamp];
else
img = img_stamps_premirror[stamp];
}
else else
img = img_stamps[stamp]; {
/* Use normal version: */
if (img_stamp_thumbs[stamp] != NULL)
img = img_stamp_thumbs[stamp];
else
img = img_stamps[stamp];
}
/* Where to put it? */ /* Where to put it? */
@ -5868,7 +5905,8 @@ void draw_stamps(void)
base_y = ((i / 2) * 48) + 40 + ((48 - (img->h)) / 2) + off_y; base_y = ((i / 2) * 48) + 40 + ((48 - (img->h)) / 2) + off_y;
if (state_stamps[stamp]->mirrored) if (state_stamps[stamp]->mirrored &&
img_stamps_premirror[stamp] == NULL)
{ {
/* It's mirrored!: */ /* It's mirrored!: */