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

Stamp scaling is now controlled by a set of mini "slider"-like buttons.

Browse source 
(The "Shrink" and "Grow" buttons didn't give any feedback as to what the
current size was.)
This commit is contained in:
William Kendrick 2005-10-22 08:42:10 +00:00
parent bb4f0efbbc
commit 4b2b90ef1c
2 changed files with 56 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/CHANGES.txt
View file

@ -128,6 +128,10 @@ http://www.newbreedsoftware.com/tuxpaint/
* Interface improvements:
-----------------------
* Stamp scaling is now controlled by a set of mini "slider"-like buttons.
The "Shrink" and "Grow" buttons didn't give any feedback as to what
the current size was.
* "New" always available.
(Prepping for when "New" will give options for background colors, etc.)

53
src/tuxpaint.c
View file

@ -3453,8 +3453,10 @@ static void mainloop(void)
{
/* Stamp controls! */
int control_sound = -1;
if (which&2)
{
#ifdef OLD_STAMP_GROW_SHRINK
/* One of the bottom buttons: */
if (which&1)
{
@ -3474,6 +3476,18 @@ static void mainloop(void)
control_sound = SND_SHRINK;
}
}
#else
int old_size;
old_size = stamp_data[cur_stamp]->size;
stamp_data[cur_stamp]->size = (((MAX_STAMP_SIZE - MIN_STAMP_SIZE) * (event.button.x - (WINDOW_WIDTH - 96))) / 96) + MIN_STAMP_SIZE;
if (stamp_data[cur_stamp]->size < old_size)
control_sound = SND_SHRINK;
else if (stamp_data[cur_stamp]->size > old_size)
control_sound = SND_GROW;
#endif
}
else
{
@ -9627,6 +9641,10 @@ static void draw_stamps(void)
int base_x, base_y;
SDL_Rect dest;
SDL_Surface * img;
int sizes, size_at;
float x_per, y_per;
int xx, yy;
SDL_Surface * btn, * blnk;
/* Draw the title: */
@ -9797,7 +9815,8 @@ static void draw_stamps(void)
SDL_BlitSurface(button_color, NULL, img_magics[MAGIC_FLIP], NULL);
SDL_BlitSurface(img_magics[MAGIC_FLIP], NULL, screen, &dest);
#ifdef OLD_STAMP_GROW_SHRINK
/* Show shrink button: */
dest.x = WINDOW_WIDTH - 96;
@ -9847,6 +9866,38 @@ static void draw_stamps(void)
SDL_BlitSurface(button_color, NULL, img_grow, NULL);
SDL_BlitSurface(img_grow, NULL, screen, &dest);
#else
sizes = MAX_STAMP_SIZE - MIN_STAMP_SIZE;
size_at = (stamp_data[cur_stamp]->size - MIN_STAMP_SIZE);
x_per = 96.0 / sizes;
y_per = 48.0 / sizes;
for (i = 0; i < sizes; i++)
{
xx = ceil(x_per);
yy = ceil(y_per * i);
if (i <= size_at)
btn = thumbnail(img_btn_down, xx, yy, 0);
else
btn = thumbnail(img_btn_up, xx, yy, 0);
blnk = thumbnail(img_btn_off, xx, 48 - yy, 0);
/* FIXME: Check for NULL! */
dest.x = (WINDOW_WIDTH - 96) + (i * x_per);
dest.y = (((7 + TOOLOFFSET / 2) * 48)) - 8;
SDL_BlitSurface(blnk, NULL, screen, &dest);
dest.x = (WINDOW_WIDTH - 96) + (i * x_per);
dest.y = (((8 + TOOLOFFSET / 2) * 48)) - 8 - (y_per * i);
SDL_BlitSurface(btn, NULL, screen, &dest);
SDL_FreeSurface(btn);
SDL_FreeSurface(blnk);
}
#endif
}
}