scratchfoundation/scratch-paint
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-paint.git synced 2024-12-24 06:22:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
1559 commits 90 branches 1008 tags 168 MiB
Commit graph

1559 commits

This branch
This branch
All branches
Author SHA1 Message Date
adroitwhiz
0f5fb40425
Merge pull request #1166 from adroitwhiz/stroke-gradient-part-1 
Gradient outlines part 1
 2020-07-28 16:46:45 -04:00
DD Liu
12f4ae32c4
Merge pull request #1191 from adroitwhiz/new-paper 
Update paper.js
 2020-07-28 16:46:16 -04:00
adroitwhiz
0b619055cc Update paper.js 2020-07-28 16:40:50 -04:00
adroitwhiz
272a10c91f Also enforce minimum gradient size in select mode 
Oops
 2020-07-28 16:36:55 -04:00
adroitwhiz
379599905a Enforce minimum gradient width for fill tool 2020-07-28 16:01:49 -04:00
DD Liu
7da1c16678
Merge pull request #1142 from fsih/reshapeCurves 
Reshape curves
 2020-07-28 15:04:51 -04:00
DD Liu
f4f83f6af3 Merge branch 'develop' into reshapeCurves 2020-07-28 14:46:04 -04:00
DD Liu
92bbe741bf
Merge pull request #1189 from adroitwhiz/eslint-react-fix 
Pin eslint-plugin-react to 7.20.3
 2020-07-28 14:17:26 -04:00
DD Liu
01864080ad Merge branch 'reshapeCurves' of github.com:fsih/scratch-paint into reshapeCurves 2020-07-28 13:47:32 -04:00
DD Liu
3039b48849 Merge branch 'develop' into reshapeCurves 2020-07-28 13:47:13 -04:00
DD Liu
311422334f
Update src/helper/selection-tools/reshape-tool.js 
Update comment to remove stroke

Co-authored-by: adroitwhiz <adroitwhiz@protonmail.com>
 2020-07-28 13:00:32 -04:00
adroitwhiz
807434a425 Pin eslint-plugin-react to 7.20.3 2020-07-28 09:45:20 -04:00
adroitwhiz
cca0832f0d Fix zero-width-outline logic 
- Set the stroke color to "null" when the width is set to 0
- Properly set the stroke color state when the width is increased from 0
 2020-07-28 08:39:49 -04:00
adroitwhiz
852eefc2d7 Fix gradient outlines with 0 width in select mode 
Previously, if you selected a shape with a gradient outline that had a
width of 0, its outline color wouldn't be null when it should have been.
 2020-07-28 08:39:49 -04:00
adroitwhiz
98daa5ee5d Gradients in line mode 
The UX here isn't the best thing in the world but I think having the
functionality is important judging from the playtest
 2020-07-28 08:39:49 -04:00
adroitwhiz
689532f269 Enforce minimum gradient size 
This fixes the bug where percertly horizontal gradients on perfectly
vertical lines and vice versa would not be rendered at all
 2020-07-28 08:39:49 -04:00
adroitwhiz
f0b1881fb0 Fix changing gradient strokes to/from null 
Hopefully the comments help; the logic is kinda convoluted here
 2020-07-28 08:39:49 -04:00
adroitwhiz
696e35582c Add GradientToolsModes for shouldShowGradientTools 
This means that gradient tools will also be enabled for the stroke color
indicator even in fill and bitmap modes, but that's okay because the
stroke color indicator will be disabled or hidden in those modes anyway.
 2020-07-28 08:39:49 -04:00
adroitwhiz
6ab7b4c67d Remove unnecessary bitmapMode params 2020-07-28 08:39:49 -04:00
adroitwhiz
a304dea338 Add gradients to bitmap shape tools 2020-07-28 08:39:49 -04:00
adroitwhiz
9f77faf5c1 Don't set color in bitmap shape onSelectionChanged 
This *should* be safe because OvalTool and RectTool's wrapper "mode"
components, the only places that call onSelectionChanged, also update
the tools' color, and the color state reducers will always set the color
every time the selection changes, meaning it'll be updated anyway.
 2020-07-28 08:39:49 -04:00
adroitwhiz
f625109c67 Make styleShape more flexible 
Now, you can pass null in for a color instead of
{primary: null, secondary: null, gradientType: GradientTypes.SOLID}
and it'll still clear the color. Passing strokeWidth is also
optional now.
 2020-07-28 08:39:49 -04:00
adroitwhiz
c81853b1b7 Make fill tool work for outlines 2020-07-28 08:39:49 -04:00
adroitwhiz
2eab5048ac Add hit result to hovered item data 2020-07-28 08:39:49 -04:00
adroitwhiz
df1989d0b0 Add gradients to vector shape tools 2020-07-28 08:39:49 -04:00
adroitwhiz
2df22838b4 Update color reducer tests 2020-07-28 08:39:49 -04:00
adroitwhiz
6094953ef4 Wire up stroke gradient controls 
* Abstract FillColorIndicator and StrokeColorIndicator to ColorIndicator
* Replace stroke color reducer with stroke style reducer
* Add color style proptype
* Clear stroke gradient in line mode
 2020-07-23 05:57:52 -04:00
adroitwhiz
a23fabd778 Fix fill color reducer test 2020-07-23 05:57:01 -04:00
adroitwhiz
f8da455005 Use createGradientObject in applyGradientTypeToSelection 2020-07-23 05:57:01 -04:00
adroitwhiz
1ecab99cfb Make style-path helpers generic over fill & stroke 2020-07-23 05:54:57 -04:00
adroitwhiz
b59af02254
Merge pull request #1006 from adroitwhiz/broad-brush-braces 
Improve broad brush handling
 2020-07-21 16:07:28 -04:00
DD Liu
f8b94a294f
Merge pull request #1154 from Jacco/fix-1153 
ungroup
 2020-07-16 22:40:26 -04:00
DD Liu
bb30345741
Merge pull request #1167 from LLK/dependabot/npm_and_yarn/scratch/paper-0.11.20200709220949 
Bump @scratch/paper from 0.11.20200529164227 to 0.11.20200709220949
 2020-07-14 16:30:41 -04:00
dependabot-preview[bot]
374810c865
Bump @scratch/paper from 0.11.20200529164227 to 0.11.20200709220949 
Bumps [@scratch/paper](https://github.com/paperjs/paper.js) from 0.11.20200529164227 to 0.11.20200709220949.
- [Release notes](https://github.com/paperjs/paper.js/releases)
- [Changelog](https://github.com/paperjs/paper.js/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/paperjs/paper.js/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-07-09 22:18:33 +00:00
adroitwhiz
dc430a0111 Fix setting of stroke colors in bitmap mode 2020-07-09 17:52:08 -04:00
adroitwhiz
1017911fd4 color -> style, move selection gradient into it 
A "style" refers to something that can fill/stroke a shape.
Currently that's either a solid color or a gradient of some orientation.
The selection gradient type reducer has been removed and folded into the
"fill style" reducer.
 2020-07-09 17:52:08 -04:00
adroitwhiz
7bab4d5ed8 Abstract color reducer into reducer-generator 2020-07-09 17:13:41 -04:00
adroitwhiz
018958ce7b Combine fill-color and fill-color-2 reducers 2020-07-09 17:13:41 -04:00
adroitwhiz
604b450b5d Simplify fill-color-2 reducer logic 
why my brain hurt???
 2020-07-09 16:06:04 -04:00
Jacco Kulman
5a154e708e ungroup 2020-06-27 14:41:24 +02:00
DD Liu
2218730c11
Merge pull request #1133 from Jacco/fix-711 
Keyboard shortcuts added
 2020-06-26 22:02:47 -04:00
DD Liu
b9eefe0b96 Merge branch 'develop' into reshapeCurves 2020-06-23 16:51:35 -04:00
DD Liu
42f74fd3a8 Reshape should hit curves, not strokes 2020-06-23 16:51:09 -04:00
Jacco Kulman
8a886a7b73 Only cut if something is selected 2020-06-21 10:16:16 +02:00
Jacco Kulman
78af17cccf shouldShow checks added 2020-06-21 09:57:27 +02:00
Jacco Kulman
b94a2addf3 Keyboard shortcuts added 2020-06-21 09:52:04 +02:00
adroitwhiz
8d52b31d82
Merge pull request #1119 from adroitwhiz/fix-mixed-color2 
Fix color button turning white when it shouldn't
 2020-06-19 12:42:44 -04:00
DD Liu
4f614c2c66
Update ref to beta 2020-06-19 12:27:55 -04:00
DD Liu
e90000b20b
Merge pull request #1120 from Jacco/fix-379 
prevent scaling factor too low (per direction)
 2020-06-18 21:37:35 -04:00
Jacco Kulman
0f24b4b6b5 MIN_SCALE_FACTOR & clamping instead of halting 2020-06-17 06:47:20 +02:00