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

WIP Ability to ungroup Magic tools

Browse source 
Put them in a big long list, without left/right pagination buttons,
like pre-0.9.27 Tux Paint.

Code is in place, but no way of activating it.

For https://sourceforge.net/p/tuxpaint/feature-requests/229/
This commit is contained in:
Bill Kendrick 2024-04-08 22:15:23 -07:00
parent 5139985781
commit 554c6145fc
2 changed files with 80 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

8
docs/CHANGES.txt
View file

@ -6,7 +6,7 @@ Copyright (c) 2002-2024
Various contributors (see below, and AUTHORS.txt) Various contributors (see below, and AUTHORS.txt)
https://tuxpaint.org/ https://tuxpaint.org/
2024.March.28 (0.9.33) 2024.April.8 (0.9.33)
* New Magic Tools: * New Magic Tools:
---------------- ----------------
* WIP Specular Reflection: Draws a slightly blurred, wavy, and * WIP Specular Reflection: Draws a slightly blurred, wavy, and
@ -48,6 +48,12 @@ https://tuxpaint.org/
(Management scripts based on those found in `tuxpaint-stamps`.) (Management scripts based on those found in `tuxpaint-stamps`.)
Bill Kendrick <bill@newbreedsoftware.com> Bill Kendrick <bill@newbreedsoftware.com>
* WIP New option, --ungroupmagictools, to ungroup Magic tools
(one big long list, rather than paginating; grouping was
added in Tux Paint 0.9.27)
Closes https://sourceforge.net/p/tuxpaint/feature-requests/229/
Bill Kendrick <bill@newbreedsoftware.com>
* Make screen refresh more snappy on macOS. * Make screen refresh more snappy on macOS.
Mark Kim <markuskimius@gmail.com> Mark Kim <markuskimius@gmail.com>

111
src/tuxpaint.c
View file

@ -22,7 +22,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)
June 14, 2002 - March 25, 2024 June 14, 2002 - April 8, 2024
*/ */
#include "platform.h" #include "platform.h"
@ -1427,6 +1427,7 @@ static int only_uppercase;
static int disable_magic_controls; static int disable_magic_controls;
static int disable_magic_sizes; static int disable_magic_sizes;
static int disable_shape_controls; static int disable_shape_controls;
static int no_magic_groups = 0;
static int shape_mode = SHAPEMODE_CENTER; static int shape_mode = SHAPEMODE_CENTER;
static int stamp_rotation_ctrl = 0; static int stamp_rotation_ctrl = 0;
@ -4335,6 +4336,9 @@ static void mainloop(void)
grp = magic_group; grp = magic_group;
cur = cur_magic[grp]; cur = cur_magic[grp];
if (no_magic_groups)
which += 2;
if (which == 0 || which == 1) if (which == 0 || which == 1)
{ {
int tries = 0; int tries = 0;
@ -10042,11 +10046,15 @@ static void draw_magic(void)
/* How many can we show? */ /* How many can we show? */
most = (buttons_tall * gd_toolopt.cols) - (gd_toolopt.cols * 2) - TOOLOFFSET - 2; most = (buttons_tall * gd_toolopt.cols) - (gd_toolopt.cols * 2) - TOOLOFFSET - 2;
if (no_magic_groups)
most = most + gd_toolopt.cols;
if (disable_magic_controls) if (disable_magic_controls)
most = most + gd_toolopt.cols; most = most + gd_toolopt.cols;
if (disable_magic_sizes) if (disable_magic_sizes)
most = most + gd_toolopt.cols; most = most + gd_toolopt.cols;
/* Draw scroll bars, if we need them */
if (num_magics[magic_group] > most + TOOLOFFSET) if (num_magics[magic_group] > most + TOOLOFFSET)
{ {
off_y = img_scroll_down->h; off_y = img_scroll_down->h;
@ -10083,6 +10091,8 @@ static void draw_magic(void)
} }
/* Draw the magic tool buttons */
for (magic = magic_scroll[magic_group]; magic < magic_scroll[magic_group] + max; magic++) for (magic = magic_scroll[magic_group]; magic < magic_scroll[magic_group] + max; magic++)
{ {
i = magic - magic_scroll[magic_group]; i = magic - magic_scroll[magic_group];
@ -10124,38 +10134,40 @@ static void draw_magic(void)
/* Draw group pagination buttons: */ /* Draw group pagination buttons: */
/* Show prev button: */ if (!no_magic_groups)
{
/* Show prev button: */
button_color = img_black; button_color = img_black;
button_body = img_btn_nav; button_body = img_btn_nav;
dest.x = WINDOW_WIDTH - r_ttoolopt.w; dest.x = WINDOW_WIDTH - r_ttoolopt.w;
dest.y = r_ttoolopt.h + (((most + TOOLOFFSET) / 2) * button_h); dest.y = r_ttoolopt.h + (((most + TOOLOFFSET) / 2) * button_h);
SDL_BlitSurface(button_body, NULL, screen, &dest); SDL_BlitSurface(button_body, NULL, screen, &dest);
dest.x = WINDOW_WIDTH - r_ttoolopt.w + (button_w - img_prev->w) / 2; dest.x = WINDOW_WIDTH - r_ttoolopt.w + (button_w - img_prev->w) / 2;
dest.y = (r_ttoolopt.h + (((most + TOOLOFFSET) / 2) * button_h) + (button_h - img_prev->h) / 2); dest.y = (r_ttoolopt.h + (((most + TOOLOFFSET) / 2) * button_h) + (button_h - img_prev->h) / 2);
SDL_BlitSurface(button_color, NULL, img_prev, NULL); SDL_BlitSurface(button_color, NULL, img_prev, NULL);
SDL_BlitSurface(img_prev, NULL, screen, &dest); SDL_BlitSurface(img_prev, NULL, screen, &dest);
/* Show next button: */ /* Show next button: */
button_color = img_black; button_color = img_black;
button_body = img_btn_nav; button_body = img_btn_nav;
dest.x = WINDOW_WIDTH - button_w; dest.x = WINDOW_WIDTH - button_w;
dest.y = r_ttoolopt.h + (((most + TOOLOFFSET) / gd_toolopt.cols) * button_h); dest.y = r_ttoolopt.h + (((most + TOOLOFFSET) / gd_toolopt.cols) * button_h);
SDL_BlitSurface(button_body, NULL, screen, &dest); SDL_BlitSurface(button_body, NULL, screen, &dest);
dest.x = WINDOW_WIDTH - button_w + (button_w - img_next->w) / 2; dest.x = WINDOW_WIDTH - button_w + (button_w - img_next->w) / 2;
dest.y = (r_ttoolopt.h + (((most + TOOLOFFSET) / gd_toolopt.cols) * button_h) + (button_h - img_next->h) / 2); dest.y = (r_ttoolopt.h + (((most + TOOLOFFSET) / gd_toolopt.cols) * button_h) + (button_h - img_next->h) / 2);
SDL_BlitSurface(button_color, NULL, img_next, NULL);
SDL_BlitSurface(img_next, NULL, screen, &dest);
SDL_BlitSurface(button_color, NULL, img_next, NULL);
SDL_BlitSurface(img_next, NULL, screen, &dest);
}
/* Draw magic controls: */ /* Draw magic controls: */
@ -10180,15 +10192,18 @@ static void draw_magic(void)
button_color = img_btn_off; /* Unavailable */ button_color = img_btn_off; /* Unavailable */
dest.x = WINDOW_WIDTH - r_ttoolopt.w; dest.x = WINDOW_WIDTH - r_ttoolopt.w;
dest.y = r_ttoolopt.h + ((most / gd_toolopt.cols + (TOOLOFFSET + 2) / gd_toolopt.cols) * button_h); // dest.y = r_ttoolopt.h + ((most / gd_toolopt.cols + (TOOLOFFSET + 2) / gd_toolopt.cols) * button_h);
dest.y = (button_h * buttons_tall + r_ttools.h) - button_h * (disable_magic_sizes ? 1 : 2);
SDL_BlitSurface(button_color, NULL, screen, &dest); SDL_BlitSurface(button_color, NULL, screen, &dest);
dest.x = WINDOW_WIDTH - r_ttoolopt.w + (button_w - img_magic_paint->w) / 2; dest.x = WINDOW_WIDTH - r_ttoolopt.w + (button_w - img_magic_paint->w) / 2;
dest.y = //dest.y =
(r_ttoolopt.h + // (r_ttoolopt.h +
((most / gd_toolopt.cols + // ((most / gd_toolopt.cols +
(TOOLOFFSET + 2) / gd_toolopt.cols) * button_h) + (button_h - img_magic_paint->h) / 2); // (TOOLOFFSET + 2) / gd_toolopt.cols) * button_h) + (button_h - img_magic_paint->h) / 2);
dest.y = (button_h * buttons_tall + r_ttools.h) - button_h * (disable_magic_sizes ? 1 : 2) +
((button_h - img_magic_paint->h) / 2);
SDL_BlitSurface(img_magic_paint, NULL, screen, &dest); SDL_BlitSurface(img_magic_paint, NULL, screen, &dest);
@ -10203,18 +10218,20 @@ static void draw_magic(void)
button_color = img_btn_off; /* Unavailable */ button_color = img_btn_off; /* Unavailable */
dest.x = WINDOW_WIDTH - button_w; dest.x = WINDOW_WIDTH - button_w;
dest.y = r_ttoolopt.h + ((most / gd_toolopt.cols + (TOOLOFFSET + 2) / gd_toolopt.cols) * button_h); // dest.y = r_ttoolopt.h + ((most / gd_toolopt.cols + (TOOLOFFSET + 2) / gd_toolopt.cols) * button_h);
dest.y = (button_h * buttons_tall + r_ttools.h) - button_h * (disable_magic_sizes ? 1 : 2);
SDL_BlitSurface(button_color, NULL, screen, &dest); SDL_BlitSurface(button_color, NULL, screen, &dest);
dest.x = WINDOW_WIDTH - button_w + (button_w - img_magic_fullscreen->w) / 2; dest.x = WINDOW_WIDTH - button_w + (button_w - img_magic_fullscreen->w) / 2;
dest.y = //dest.y =
(r_ttoolopt.h + // (r_ttoolopt.h +
((most / gd_toolopt.cols + // ((most / gd_toolopt.cols +
(TOOLOFFSET + 2) / gd_toolopt.cols) * button_h) + (button_h - img_magic_fullscreen->h) / 2); // (TOOLOFFSET + 2) / gd_toolopt.cols) * button_h) + (button_h - img_magic_fullscreen->h) / 2);
dest.y = (button_h * buttons_tall + r_ttools.h) - button_h * (disable_magic_sizes ? 1 : 2) +
((button_h - img_magic_fullscreen->h) / 2);
SDL_BlitSurface(img_magic_fullscreen, NULL, screen, &dest); SDL_BlitSurface(img_magic_fullscreen, NULL, screen, &dest);
} }
@ -21781,12 +21798,17 @@ static void load_magic_plugins(void)
} }
else else
{ {
int j, group, idx; int j, group, idx, want_group, want_order;
SDL_Surface *icon_tmp; SDL_Surface *icon_tmp;
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
{ {
group = magic_funcs[num_plugin_files].get_group(magic_api_struct, i); want_group = magic_funcs[num_plugin_files].get_group(magic_api_struct, i);
if (!no_magic_groups)
group = want_group;
else
group = 0;
if (group < MAX_MAGIC_GROUPS) if (group < MAX_MAGIC_GROUPS)
{ {
idx = num_magics[group]; idx = num_magics[group];
@ -21796,7 +21818,11 @@ static void load_magic_plugins(void)
magics[group][idx].handle_idx = num_plugin_files; magics[group][idx].handle_idx = num_plugin_files;
magics[group][idx].group = group; magics[group][idx].group = group;
magics[group][idx].name = magic_funcs[num_plugin_files].get_name(magic_api_struct, i); magics[group][idx].name = magic_funcs[num_plugin_files].get_name(magic_api_struct, i);
magics[group][idx].order = magic_funcs[num_plugin_files].get_order(i); want_order = magic_funcs[num_plugin_files].get_order(i);
if (!no_magic_groups)
magics[group][idx].order = want_order;
else
magics[group][idx].order = (want_group * 1000000) + want_order;
magics[group][idx].avail_modes = magic_funcs[num_plugin_files].modes(magic_api_struct, i); magics[group][idx].avail_modes = magic_funcs[num_plugin_files].modes(magic_api_struct, i);
@ -21896,6 +21922,12 @@ static void load_magic_plugins(void)
num_magics[group]++; num_magics[group]++;
num_magics_total++; num_magics_total++;
if (num_magics[group] >= MAX_MAGICS_PER_GROUP) {
fprintf(stderr, "Error: exceeded maximum number of Magic tools (%d) in group %d!\n",
MAX_MAGICS_PER_GROUP, group);
num_magics[group]--; // FIXME: Do something better than just this! -bjk 2024.04.08
}
} }
else else
{ {
@ -32367,8 +32399,11 @@ int calc_magic_control_rows(void)
{ {
int r; int r;
/* Start with group changing (left/right) buttons */ r = 0;
r = 1;
/* Add group changing (left/right) buttons */
if (!no_magic_groups)
r++;
/* Add magic controls (paint vs fullscreen) */ /* Add magic controls (paint vs fullscreen) */
if (!disable_magic_controls) if (!disable_magic_controls)