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

Stamp rotation on by default

Browse source
This commit is contained in:
Bill Kendrick 2022-09-05 00:42:03 -07:00
parent 270f5353e0
commit 9c25b2fda5
4 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
docs/CHANGES.txt
View file

@ -10,9 +10,8 @@ http://www.tuxpaint.org/
2022.September.5 (0.9.29) 2022.September.5 (0.9.29)
* Improvements to "Stamp" tool: * Improvements to "Stamp" tool:
----------------------------- -----------------------------
* WIP - Stamps may now be rotated. * Stamps may now be rotated.
Use the "--stamp-rotation" option. FIXME: Likely to Use the "stamprotation=no" option to disable.
become default, with a "--no..." option.
Pere Pujal i Carabantes <perepujal@gmail.com> Pere Pujal i Carabantes <perepujal@gmail.com>
* Bug Fixes: * Bug Fixes:

2
src/parse.gperf
View file

@ -154,7 +154,7 @@ stereo, POSBOOL(use_stereo)
stampcontrols, NEGBOOL(disable_stamp_controls) stampcontrols, NEGBOOL(disable_stamp_controls)
stamps, NEGBOOL(dont_load_stamps) stamps, NEGBOOL(dont_load_stamps)
stampsize, MULTI(stamp_size_override) stampsize, MULTI(stamp_size_override)
stamp-rotation, POSBOOL(stamp_rotation) stamprotation, NEGBOOL(no_stamp_rotation)
startblank, POSBOOL(start_blank) startblank, POSBOOL(start_blank)
startlast, NEGBOOL(start_blank) startlast, NEGBOOL(start_blank)
sysconfig, POSBOOL(parsertmp_sysconfig) sysconfig, POSBOOL(parsertmp_sysconfig)

2
src/parse.h
View file

@ -24,7 +24,7 @@ struct cfginfo
const char *disable_stamp_controls; const char *disable_stamp_controls;
const char *dont_do_xor; const char *dont_do_xor;
const char *dont_load_stamps; const char *dont_load_stamps;
const char *stamp_rotation; const char *no_stamp_rotation;
const char *exportdir; const char *exportdir;
const char *fullscreen; const char *fullscreen;
const char *grab_input; const char *grab_input;

8
src/tuxpaint.c
View file

@ -1374,7 +1374,7 @@ static int dont_load_stamps;
static int mirrorstamps; static int mirrorstamps;
static int disable_stamp_controls; static int disable_stamp_controls;
static int stamp_size_override = -1; static int stamp_size_override = -1;
static int stamp_rotation = 0; static int no_stamp_rotation = 0;
static int new_colors_last; static int new_colors_last;
#ifdef NOKIA_770 #ifdef NOKIA_770
@ -5809,7 +5809,7 @@ static void mainloop(void)
{ {
if (old_x >= 0 && old_y >= 0 && old_x <= r_canvas.w && old_y <= r_canvas.h) if (old_x >= 0 && old_y >= 0 && old_x <= r_canvas.w && old_y <= r_canvas.h)
{ {
if (stamp_rotation) if (!no_stamp_rotation)
{ {
/* Going through stamp rotation step, first */ /* Going through stamp rotation step, first */
@ -7504,7 +7504,7 @@ static void stamp_draw(int x, int y, int stamp_angle_rotation)
dont_free_scaled_surf = 1; dont_free_scaled_surf = 1;
} }
/* Rotate the stamp if stamp_rotation is configured */ /* Rotate the stamp (if no_stamp_rotation is not configured) */
if (stamp_angle_rotation) if (stamp_angle_rotation)
tmp_surf = rotozoomSurface(tmp_surf, stamp_angle_rotation, 1.0, SMOOTHING_ON); tmp_surf = rotozoomSurface(tmp_surf, stamp_angle_rotation, 1.0, SMOOTHING_ON);
@ -26660,7 +26660,7 @@ static void setup_config(char *argv[])
SETBOOL(hide_cursor); SETBOOL(hide_cursor);
SETBOOL(keymouse); SETBOOL(keymouse);
SETBOOL(mirrorstamps); SETBOOL(mirrorstamps);
SETBOOL(stamp_rotation); SETBOOL(no_stamp_rotation);
SETBOOL(native_screensize); SETBOOL(native_screensize);
SETBOOL(new_colors_last); SETBOOL(new_colors_last);
SETBOOL(no_button_distinction); SETBOOL(no_button_distinction);