Re: [Tuxpaint-devel] WIP: Brush spacing option

[Pere P. i C. <per...@gm...>]

Hi Bill, and all,

El dc. 19 de 01 de 2022 a les 01:58 -0800, en/na Bill Kendrick va escriure:
> I'm working on a brush spacing option.  This will allow you to
> adjust the spacing of brushes within Tux Paint itself.
> (It will affect both the Paint (brush) and Lines tools.)
> 
> The interface will appear similar to the size option for Stamps
> (as well as the slideshow playback speed option) -- that is,
> a set of small buttons that increase in size from left-to-right.
> It will appear at the lower right, below the brush selector
> and (if needed) its scroll-down button.

One could imagine that identical selectors serve the same purpose,
increase/decrease the size of stamps/brushes, may it be confusing
to children to use that selector to approach/separe?

What about a couple of buttons with dots that approach/separe like

.    .
<>  ><

  . .
<>  ><
it would act like the Text and Labels up/down arrow keys 

> 
> This feature can be disabled (returning Tux Paint to the
> simpler times of pre-0.9.28) via a "--nobrushspacing" option
> (which is also exposed in Tux Paint Config., under "Simplifcation").
> 
> Right now, it doesn't actually DO anything except show the spacing
> of each brush, as you choose them.  But it's 2am here and I really
> need to get to bed. :)
> 
> Just a heads-up!
> 
> PS to Pere - I'm doing this in the main branch.  I need to stop
> working there, so we can focus on the SDL2 branch, and let the
> original branch rest in peace. :-D  Sorry for making more work
> for you.

No worries, but I will need some help this time:

make clean && git stash to get the tree clean, then

git checkout master && git pull && \
git checkout sdl2.0 && git pull && git merge master

gives 2 conflicts, one in docs/CHANGES.txt, easy to fix, 
and the other in win32/tuxpaint.iss and I know nothing about
its language.

I see the conflict related to fixes with the Windows installer 
as if were there 2 different approaches to fix it and the both 
conflicted with each other.

Could somebody help here?

Thanks
Pere