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

Was always using the first brush when drawing shapes.

Browse source 
Now forcing it to always use "round_03.png", since brushes are
sorted alphabetically, and some new brushes appear before round ones!
This commit is contained in:
William Kendrick 2006-09-06 23:09:12 +00:00
parent d08b50e36f
commit ddf4738df2
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
docs/CHANGES.txt
View file

@ -9,7 +9,7 @@ http://www.newbreedsoftware.com/tuxpaint/
$Id$
2006.September.5 (0.9.16)
2006.September.6 (0.9.16)
* Interface improvements:
-----------------------
@ -262,6 +262,10 @@ $Id$
(Fixes bug #1527884)
James Le Cuirot
* Was always using the first brush when drawing shapes.
Now forcing it to always use "round_03.png", since brushes are
sorted alphabetically, and some new brushes appear before round ones!
2005.November.26 (0.9.15b)

10
src/tuxpaint.c
View file

@ -22,7 +22,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt)
June 14, 2002 - September 5, 2006
June 14, 2002 - September 6, 2006
$Id$
*/
@ -947,7 +947,8 @@ static int stamp_tintable(int stamp)
static int num_brushes, num_brushes_max;
#define SHAPE_BRUSH_NAME "round_03.png"
static int num_brushes, num_brushes_max, shape_brush = 0;
static SDL_Surface **img_brushes;
static int * brushes_frames = NULL;
static int * brushes_spacing = NULL;
@ -5247,6 +5248,9 @@ static void loadbrush_callback(SDL_Surface * screen,
if (strcasestr(files[i].str, ".png"))
{
char fname[512];
if (strcasecmp(files[i].str, SHAPE_BRUSH_NAME) == 0)
shape_brush = num_brushes;
snprintf(fname, sizeof fname, "%s/%s", dir, files[i].str);
if (num_brushes == num_brushes_max)
{
@ -10925,7 +10929,7 @@ static void do_shape(int cx, int cy, int ox, int oy, int rotn, int use_brush)
if (use_brush)
{
old_brush = cur_brush;
cur_brush = 0; /* Kludgy! */
cur_brush = shape_brush; /* Now only semi-ludgy! */
render_brush();
}