diff --git a/data/brushes/dog.dat b/data/brushes/dog.dat new file mode 100644 index 000000000..2eef1561a --- /dev/null +++ b/data/brushes/dog.dat @@ -0,0 +1,3 @@ +frames=2 +directional +spacing=48 diff --git a/data/brushes/dog.png b/data/brushes/dog.png new file mode 100644 index 000000000..b5c7f1749 Binary files /dev/null and b/data/brushes/dog.png differ diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index 8d422e68d..4b3aeabeb 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -128,12 +128,18 @@ http://www.tuxpaint.org/ you scale down (similar to "Panels", but with non-integer scaling). Bill Kendrick + * New Brushes: + ------------ + * "Dog" animated directional brush. + (Modified version of art from the "oneko" package by Tatsuya Kato. + https://github.com/tie/oneko) + Brushified by Bill Kendrick + * Other Improvements: ------------------- * The up & down scroll buttons now auto-repeat if you click/tap and - hold them in the "Tools" section, [WIP] the "Open" dialog, - the "New" dialog, and the "Slideshow" dialog. - For https://sourceforge.net/p/tuxpaint/feature-requests/173/ + hold them in the "Tools" section, and "Open", "New", and "Slideshow" + dialogs. (For https://sourceforge.net/p/tuxpaint/feature-requests/173/) Bill Kendrick * Localization Updates: diff --git a/src/tuxpaint.c b/src/tuxpaint.c index 1234ea712..859564425 100644 --- a/src/tuxpaint.c +++ b/src/tuxpaint.c @@ -16140,13 +16140,13 @@ static int do_open(void) scrolling_dialog = 1; SDL_InitSubSystem(SDL_INIT_TIMER); scrolltimer_dialog = - SDL_AddTimer(1/*REPEAT_SPEED*/, scrolltimer_dialog_callback, (void *)&scrolltimer_dialog_event); + SDL_AddTimer(REPEAT_SPEED, scrolltimer_dialog_callback, (void *)&scrolltimer_dialog_event); } else { DEBUG_PRINTF("Continuing scrolling\n"); scrolltimer_dialog = - SDL_AddTimer(1/*REPEAT_SPEED / 3*/, scrolltimer_dialog_callback, (void *)&scrolltimer_dialog_event); + SDL_AddTimer(REPEAT_SPEED / 3, scrolltimer_dialog_callback, (void *)&scrolltimer_dialog_event); } } } @@ -16315,12 +16315,6 @@ static int do_open(void) handle_joybuttonupdown(event, oldpos_x, oldpos_y); } /* while (SDL_PollEvent(&event)) */ - if (scrolltimer_dialog != NULL) - { - SDL_RemoveTimer(scrolltimer_dialog); - scrolltimer_dialog = NULL; - } - if (motioner | hatmotioner) handle_motioners(oldpos_x, oldpos_y, motioner, hatmotioner, old_hat_ticks, val_x, val_y, valhat_x, valhat_y);