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

Gave ordering to all Picture Decorations magic tools

Browse source
This commit is contained in:
Bill Kendrick 2024-01-16 22:48:41 -08:00
parent b1bc736f77
commit e3cb845426
3 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
magic/src/blind.c
View file

@ -6,7 +6,7 @@
By Pere Pujal Carabantes By Pere Pujal Carabantes
Copyright (c) 2009-2023 Copyright (c) 2009-2024
https://tuxpaint.org/ https://tuxpaint.org/
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
@ -24,7 +24,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)
Last updated: December 29, 2023 Last updated: January 16, 2024
*/ */
#include "tp_magic_api.h" #include "tp_magic_api.h"
@ -62,6 +62,7 @@ int blind_get_tool_count(magic_api * api);
SDL_Surface *blind_get_icon(magic_api * api, int which); SDL_Surface *blind_get_icon(magic_api * api, int which);
char *blind_get_name(magic_api * api, int which); char *blind_get_name(magic_api * api, int which);
int blind_get_group(magic_api * api, int which); int blind_get_group(magic_api * api, int which);
int blind_get_order(int which);
char *blind_get_description(magic_api * api, int which, int mode); char *blind_get_description(magic_api * api, int which, int mode);
int blind_requires_colors(magic_api * api, int which); int blind_requires_colors(magic_api * api, int which);
void blind_release(magic_api * api, int which, void blind_release(magic_api * api, int which,
@ -131,6 +132,11 @@ int blind_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED
return MAGIC_TYPE_PICTURE_DECORATIONS; return MAGIC_TYPE_PICTURE_DECORATIONS;
} }
int blind_get_order(int which ATTRIBUTE_UNUSED)
{
return 100;
}
char *blind_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) char *blind_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{ {
return return

10
magic/src/checkerboard.c
View file

@ -7,7 +7,7 @@
By Bill Kendrick By Bill Kendrick
Based on `blind.c` by Pere Pujal Carabantes Based on `blind.c` by Pere Pujal Carabantes
Copyright (c) 2021-2023 Copyright (c) 2021-2024
https://tuxpaint.org/ https://tuxpaint.org/
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
@ -25,7 +25,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)
Last updated: December 29, 2023 Last updated: January 16, 2024
*/ */
#include "tp_magic_api.h" #include "tp_magic_api.h"
@ -46,6 +46,7 @@ int checkerboard_get_tool_count(magic_api * api);
SDL_Surface *checkerboard_get_icon(magic_api * api, int which); SDL_Surface *checkerboard_get_icon(magic_api * api, int which);
char *checkerboard_get_name(magic_api * api, int which); char *checkerboard_get_name(magic_api * api, int which);
int checkerboard_get_group(magic_api * api, int which); int checkerboard_get_group(magic_api * api, int which);
int checkerboard_get_order(int which);
char *checkerboard_get_description(magic_api * api, int which, int mode); char *checkerboard_get_description(magic_api * api, int which, int mode);
int checkerboard_requires_colors(magic_api * api, int which); int checkerboard_requires_colors(magic_api * api, int which);
void checkerboard_release(magic_api * api, int which, void checkerboard_release(magic_api * api, int which,
@ -119,6 +120,11 @@ int checkerboard_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE
return MAGIC_TYPE_PICTURE_DECORATIONS; return MAGIC_TYPE_PICTURE_DECORATIONS;
} }
int checkerboard_get_order(int which ATTRIBUTE_UNUSED)
{
return 200;
}
char *checkerboard_get_description(magic_api * api ATTRIBUTE_UNUSED, char *checkerboard_get_description(magic_api * api ATTRIBUTE_UNUSED,
int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{ {

10
magic/src/snow.c
View file

@ -6,7 +6,7 @@
Credits: Andrew Corcoran <akanewbie@gmail.com> Credits: Andrew Corcoran <akanewbie@gmail.com>
Copyright (c) 2002-2023 by Bill Kendrick and others; see AUTHORS.txt Copyright (c) 2002-2024 by Bill Kendrick and others; see AUTHORS.txt
bill@newbreedsoftware.com bill@newbreedsoftware.com
https://tuxpaint.org/ https://tuxpaint.org/
@ -25,7 +25,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)
Last updated: December 29, 2023 Last updated: January 16, 2024
TODO: TODO:
* Support sizes (for snowflakes, we'll need a new set of bitmap PNGs!) -bjk 2023.04.22 * Support sizes (for snowflakes, we'll need a new set of bitmap PNGs!) -bjk 2023.04.22
@ -88,6 +88,7 @@ int snow_get_tool_count(magic_api * api);
SDL_Surface *snow_get_icon(magic_api * api, int which); SDL_Surface *snow_get_icon(magic_api * api, int which);
char *snow_get_name(magic_api * api, int which); char *snow_get_name(magic_api * api, int which);
int snow_get_group(magic_api * api, int which); int snow_get_group(magic_api * api, int which);
int snow_get_order(int which);
char *snow_get_description(magic_api * api, int which); char *snow_get_description(magic_api * api, int which);
static void do_snow(void *ptr, SDL_Surface * canvas, SDL_Surface * last, int which, int snowAmount); static void do_snow(void *ptr, SDL_Surface * canvas, SDL_Surface * last, int which, int snowAmount);
void snow_drag(magic_api * api, int which, SDL_Surface * canvas, void snow_drag(magic_api * api, int which, SDL_Surface * canvas,
@ -171,6 +172,11 @@ int snow_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
return MAGIC_TYPE_PICTURE_DECORATIONS; /* Because we affect the whole image, and not just around the mouse */ return MAGIC_TYPE_PICTURE_DECORATIONS; /* Because we affect the whole image, and not just around the mouse */
} }
int snow_get_order(int which)
{
return 1000 + which;
}
// Return our descriptions, localized: // Return our descriptions, localized:
char *snow_get_description(magic_api * api ATTRIBUTE_UNUSED, int which) char *snow_get_description(magic_api * api ATTRIBUTE_UNUSED, int which)
{ {