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

Magic size controls work!

Browse source 
However, need to make their availability set-able on a per-mode
basis.
This commit is contained in:
Bill Kendrick 2023-04-12 23:09:37 -07:00
parent 3996edaeec
commit 5bbfd91c2c
2 changed files with 63 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/CHANGES.txt
View file

@ -26,7 +26,7 @@ https://tuxpaint.org/
---------------------------- ----------------------------
* Support for sizes in Magic tools via the plugin API. * Support for sizes in Magic tools via the plugin API.
(Closes https://sourceforge.net/p/tuxpaint/feature-requests/220/) (Closes https://sourceforge.net/p/tuxpaint/feature-requests/220/)
+ WIP Adds a new UI element for setting sizes in the Magic tool. + Adds a new UI element for setting sizes in the Magic tool.
+ May be disabled with the "nomagicsizes" option. + May be disabled with the "nomagicsizes" option.
+ Plugins' "init()" functions are sent a new "disabled_features" + Plugins' "init()" functions are sent a new "disabled_features"
argument containing bitmask of Magic-relevant disabled features argument containing bitmask of Magic-relevant disabled features

101
src/tuxpaint.c
View file

@ -4502,45 +4502,68 @@ static void mainloop(void)
} }
else else
{ {
/* Magic controls! */ if (!disable_magic_controls && (which == 2 || which == 3)) {
if (which == 3 /* Magic controls! */
&& magics[grp][cur].avail_modes & MODE_FULLSCREEN) if (which == 3
{ && magics[grp][cur].avail_modes & MODE_FULLSCREEN)
magic_switchout(canvas); {
magics[grp][cur].mode = MODE_FULLSCREEN; magic_switchout(canvas);
magic_switchin(canvas); magics[grp][cur].mode = MODE_FULLSCREEN;
draw_magic(); magic_switchin(canvas);
update_screen_rect(&r_toolopt); draw_magic();
update_screen_rect(&r_toolopt);
}
else if (which == 2
&& magics[grp][cur].avail_modes & MODE_PAINT)
{
magic_switchout(canvas);
magics[grp][cur].mode = MODE_PAINT;
magic_switchin(canvas);
draw_magic();
update_screen_rect(&r_toolopt);
}
else if (which == 2
&& magics[grp][cur].avail_modes &
MODE_PAINT_WITH_PREVIEW)
{
magic_switchout(canvas);
magics[grp][cur].mode = MODE_PAINT_WITH_PREVIEW;
magic_switchin(canvas);
draw_magic();
update_screen_rect(&r_toolopt);
}
else if (which == 2
&& magics[grp][cur].avail_modes & MODE_ONECLICK)
{
magic_switchout(canvas);
magics[grp][cur].mode = MODE_ONECLICK;
magic_switchin(canvas);
draw_magic();
update_screen_rect(&r_toolopt);
}
playsound(screen, 0, SND_CLICK, 0, SNDPOS_CENTER, SNDDIST_NEAR);
} else if (!disable_magic_sizes) {
if (magics[grp][cur].sizes > 1) {
int old_size, new_size;
old_size = magics[grp][cur].size;
new_size = ((magics[grp][cur].sizes * (event.button.x - (WINDOW_WIDTH - r_ttoolopt.w))) / r_ttoolopt.w) + 1;
if (new_size != old_size) {
magics[grp][cur].size = new_size;
magic_set_size();
draw_magic();
update_screen_rect(&r_toolopt);
if (new_size < old_size)
playsound(screen, 0, SND_SHRINK, 0, SNDPOS_CENTER, SNDDIST_NEAR);
else
playsound(screen, 0, SND_GROW, 0, SNDPOS_CENTER, SNDDIST_NEAR);
}
}
} }
else if (which == 2
&& magics[grp][cur].avail_modes & MODE_PAINT)
{
magic_switchout(canvas);
magics[grp][cur].mode = MODE_PAINT;
magic_switchin(canvas);
draw_magic();
update_screen_rect(&r_toolopt);
}
else if (which == 2
&& magics[grp][cur].avail_modes &
MODE_PAINT_WITH_PREVIEW)
{
magic_switchout(canvas);
magics[grp][cur].mode = MODE_PAINT_WITH_PREVIEW;
magic_switchin(canvas);
draw_magic();
update_screen_rect(&r_toolopt);
}
else if (which == 2
&& magics[grp][cur].avail_modes & MODE_ONECLICK)
{
magic_switchout(canvas);
magics[grp][cur].mode = MODE_ONECLICK;
magic_switchin(canvas);
draw_magic();
update_screen_rect(&r_toolopt);
}
/* FIXME: Sfx */
} }
} }
else if (cur_tool == TOOL_SHAPES) else if (cur_tool == TOOL_SHAPES)
@ -10549,7 +10572,7 @@ static void draw_magic(void)
xx = ceil(x_per); xx = ceil(x_per);
yy = ceil(y_per * (float) i); yy = ceil(y_per * (float) i);
if (i <= magics[grp][cur].size + 1) if (i <= magics[grp][cur].size)
btn = thumbnail(img_btn_down, xx, yy, 0); btn = thumbnail(img_btn_down, xx, yy, 0);
else else
btn = thumbnail(img_btn_up, xx, yy, 0); btn = thumbnail(img_btn_up, xx, yy, 0);