scratchfoundation/scratch-paint
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-paint.git synced 2024-12-23 05:52:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
2930 commits 90 branches 1006 tags 166 MiB
Commit graph

401 commits

Author SHA1 Message Date
adroitwhiz
24ec9f76a6 travis ci 2020-01-28 12:08:27 -05:00
adroitwhiz
609fd939d9 Add transparent crosshair above dragged items 2020-01-28 12:08:27 -05:00
adroitwhiz
50172d494c Skip processing of child paths in color swap 2020-01-09 15:02:20 -05:00
adroitwhiz
41e0765657 Skip processing of child paths in mergeEraser 2020-01-09 15:00:12 -05:00
DD Liu
e84b40cc72 Set rotation center of empty bitmaps to (0, 0) 2019-12-06 00:52:16 -05:00
adroitwhiz
46f5db055d Handle null color in bitmap shape tools 2019-11-08 09:23:36 -05:00
adroitwhiz
4e4c02c7b4 Call inlineSvgFonts() on string instead of element 2019-05-16 16:51:36 -04:00
Paul Kaplan
5a3cb1c8de Change fill logic to prevent setting gradients by accident 2019-03-06 13:26:13 -05:00
Paul Kaplan
7f1c0c2a65 Move eyedropper callback into mouseUp to allow dragging the loupe around 2019-01-14 10:19:39 -05:00
Florrie
934b756032 Make mouse cursor react to what it's hovered over (#762) 2018-12-10 17:42:29 -05:00
Florrie
a04f1276f8 Make circle (shift-oval) tool work for any direction dragged (#774) 2018-11-28 13:16:20 -05:00
DD Liu
b3009320d1
Fix issues handling rasters in reshape (#756) 2018-11-05 15:58:42 -05:00
DD Liu
4bc3b5b624
Cut off text2 (#744) 2018-10-29 11:01:53 -04:00
DD Liu
c6fb28a69c
Make stroke width 0 when transparent (#695) 2018-09-26 13:08:47 -04:00
DD Liu
8daea46ad6
Use consistent hit testing (#689) 2018-09-26 11:19:46 -04:00
DD Liu
bcc3af4571
Save after adding points (#696) 2018-09-24 13:47:57 -04:00
DD Liu
c8a5db311b
Don't scale text outlines (#685) 2018-09-18 16:30:56 -04:00
DD Liu
b6ad997ea2
Switch fix aspect ratio to default when resizing by a corner (#681) 2018-09-17 13:43:51 -04:00
DD Liu
4b658c294f
Bitmap select state (#678) 2018-09-17 13:38:16 -04:00
DD Liu
02ea26efe7
Add safety checks to fill and stroke colors (#682) 2018-09-14 16:14:34 -04:00
DD Liu
ca04db7094
Export bit shapes (#662) 2018-09-12 18:17:45 -04:00
DD Liu
a105d967ba
Fence tools to make it less easy to lose work off the sides (#671) 2018-09-12 18:03:19 -04:00
DD Liu
e4883063fe
Handle transparency in bitmap tools (#660) 2018-09-12 13:21:54 -04:00
DD Liu
6f5c47686d
Rtl text tool (#651) 2018-09-05 17:19:40 -04:00
DD Liu
4be60cae49
Copy and delete work on all objects when none are selected (#634) 2018-09-05 15:34:00 -04:00
DD Liu
516f6eb714
Zoom to fit (#629) 
Note do not merge without GUI change
 2018-08-31 12:07:17 -04:00
DD Liu
20a98db397
Break paint-editor.jsx code out into HOCs (#633) 2018-08-30 17:51:11 -04:00
DD Liu
4474ec3aa1
Keyboard shortcuts (#623) 2018-08-29 15:29:13 -04:00
DD Liu
50de05cee4
Scrollbars (#602) 2018-08-16 16:49:43 -04:00
DD Liu
2791866a9e
Reduce tolerance across the board. Don't accept hit results on helper items unless they are handles. (#597) 2018-08-16 13:09:26 -04:00
DD Liu
8267e11176
Double click in select modes switches to text tool (#583) 2018-08-09 10:55:44 -04:00
Jacco Kulman
8056a788e7 Loupe issues fixed #378 (#382) 2018-08-08 18:27:01 -04:00
DD Liu
6c84cbf76d
Selection limit (#572) 2018-08-03 13:10:45 -04:00
DD Liu
df88d56d1b
Save bitmap selection (#569) 2018-07-25 19:07:35 -04:00
DD Liu
f7ca2c7e43
Leftover selection boxes (#570) 2018-07-25 16:28:55 -04:00
DD Liu
af3c6694d4
Bitmap gradient (#559) 2018-07-17 17:21:02 -04:00
DD Liu
4ba79cacbb
Vector gradient (#558) 2018-07-17 16:37:03 -04:00
DD Liu
4e4bb396a6
Draw oval and rectangle outlines in bitmap (#550) 2018-07-12 15:48:30 -04:00
DD Liu
652a3ca89b
Update image when deleting points (#551) 2018-07-11 14:10:03 -04:00
DD Liu
90bc640dbb Fix reshape 2018-07-06 11:29:06 -04:00
DD Liu
e215b8a9b8 Fix issue with pasting vector into bitmap 2018-06-28 17:52:15 -04:00
DD Liu
e2cc5e46b0 Merge branch 'develop' into bitSelectTool 2018-06-28 02:18:01 -04:00
DD Liu
d7bd6280ed clean up 2018-06-28 02:04:24 -04:00
DD Liu
0483d65413 Fix paste and transform bugs 2018-06-28 01:54:05 -04:00
DD Liu
eed84d8cf2 Handle flip in bitmap 2018-06-28 00:21:01 -04:00
DD Liu
a04088898e keep reference to selection 2018-06-27 23:42:29 -04:00
DD
ddca91a567 Fix the undo bug, but this time it's more real 2018-06-27 15:29:13 -04:00
DD
7aa74d7ffd wip 2018-06-26 16:04:38 -04:00
DD Liu
093c3d03bb
Redo fill logic (#525) 2018-06-26 14:53:03 -04:00
DD
8759a3306f Keep scaled down images from becoming blurry 2018-06-25 19:37:47 -04:00
DD
f4df0e07af Redo fill logic 2018-06-25 16:57:56 -04:00
DD
57e3f3c8cb Handle undo 2018-06-25 11:51:33 -04:00
DD
a0faa1418e Fix flipped resizing 2018-06-21 10:43:41 -04:00
DD Liu
9c73d1a7d9 Add files 2018-06-21 10:22:24 -04:00
DD
644655d25e Bitmap select tool 2018-06-20 21:26:40 -04:00
DD Liu
d7298c0c43
Bit text tool (#515) 2018-06-19 14:54:29 -04:00
DD Liu
a70f8e1f36
Bitmap Oval tool (#516) 2018-06-19 14:20:06 -04:00
Paul Kaplan
512d39e63b Better fix for bit brush on touch, including isEraser fix (#512) 2018-06-14 12:01:01 -04:00
DD Liu
c7e0caaca7
Fill tool (#504) 2018-06-14 11:44:11 -04:00
DD Liu
4cadcb3da3
Bitmap eraser tool (#507) 2018-06-14 10:35:02 -04:00
Paul Kaplan
f785ac0c42 Fix line tool for touch as well 2018-06-13 16:45:11 -04:00
Paul Kaplan
19a0061bdf Make sure tmpCanvas exists before drawing it 2018-06-13 16:29:54 -04:00
DD Liu
389eba6284
Bitmap rectangle tool (#494) 2018-06-11 11:48:35 -04:00
DD Liu
ebed37390d
Move convert to bitmap into bitmap helper (#490) 2018-06-07 11:26:26 -04:00
Paul Kaplan
a9ba5eac9b Protect against drawing zero sized images, fixing Firefox crashes (#495) 
* Protect against drawing zero sized images, fixing Firefox crashes

* Remove removing raster

Let the layer.js helper manage the raster object
 2018-06-07 10:19:06 -04:00
DD Liu
44f71d9f72
Fix drawing rectangle while holding shift (#493) 2018-06-07 10:01:23 -04:00
DD Liu
63198c05b4
Fix firefox wrap and opaque text selection (#474) 2018-05-24 14:16:00 -04:00
DD Liu
09babb15c5
Safety check cursor preview (#470) 2018-05-23 16:39:18 -04:00
DD Liu
f9e00afdc8
Dont translate fonts and increase default font size (#450) 
* Remove internationalization from all font names
* Bump up the default font sizes
 2018-05-17 15:34:36 -04:00
DD Liu
0240abcfe3
Font tool (#443) 
Add font picker
 2018-05-17 10:37:02 -04:00
DD Liu
89133f42e5
Update import and export types (#412) 
* Import/export bitmap
* Fix playground and readme
* Use constants instead of changing zoom level for every import/export
 2018-05-01 16:18:24 -04:00
DD Liu
3d99044ccf
Import and export bitmaps (#404) 
* Rename svg to image

* Import/export bitmap

* Fix playground and readme

* Fix lint

* Assume strings are svgs
 2018-04-26 18:45:50 -04:00
DD
ed114bb073 Move getBrushMark to helper 2018-04-26 14:54:44 -04:00
DD Liu
0755df9990 Add line tool 2018-04-25 15:26:48 -04:00
DD
f08c3e140f Fix merge 2018-04-20 11:27:09 -04:00
DD
bec01149ea Fix review comments 2018-04-20 11:20:38 -04:00
DD Liu
8d55265de1 Double resolution on import and halve on export 2018-04-20 11:17:42 -04:00
DD Liu
99534eb24c
Merge pull request #387 from fsih/raster 
Bitmap brush
 2018-04-20 11:05:44 -04:00
DD
88c9f17998 fix review comments 2018-04-20 10:57:10 -04:00
DD
d6111ed031 Remove unused code 2018-04-17 15:01:10 -04:00
DD
bda357bca6 Delete extra tools 2018-04-17 14:57:50 -04:00
DD
87d9386906 Allow odd numbers for very small brush sizes for detail 2018-04-17 14:51:34 -04:00
DD
ca42dc7735 Double pixel brush drawin working 2018-04-13 11:33:47 -04:00
Jacco Kulman
507047e245 Fix whitespace 2018-04-13 11:33:04 +02:00
Jacco Kulman
71e01dd9c4 Escape end text edit mode 2018-04-13 08:16:43 +02:00
DD
420e1013cf Use a separate state to track the size of the bitmap brush tool from the brush tool 2018-04-12 16:56:54 -04:00
DD
9c84537a42 Switch tools when switching editors. Pipe through vector brush size for now. 2018-04-12 10:56:16 -04:00
DD
7855ae8893 Merge branch 'develop' into raster 2018-04-11 18:05:13 -04:00
DD Liu
bf1d4ca82a
Merge pull request #370 from fsih/convertToBitmap 
Convert to bitmap
 2018-04-11 15:50:18 -04:00
DD Liu
6252366759
Merge pull request #360 from fsih/fillTransparentText 
Add ability to fill transparent text
 2018-04-11 14:45:56 -04:00
DD Liu
e14198faea
Merge pull request #369 from fsih/boundingBoxToolOnNoSelection 
Make sure to remove the bounding box when no items are selected
 2018-04-11 14:32:18 -04:00
DD
41a68b1aea Merge branch 'develop' into convertToBitmap 2018-04-11 10:36:14 -04:00
DD
a74e5882cd Rename undo formats, and make format change on costume change skip convert 2018-04-10 18:02:44 -04:00
DD
40871b1c0f Rename undo formats, and make format change on costume change skip convert 2018-04-10 18:02:30 -04:00
DD
c6a282c97b Add ellipse drawing algorithm and temp brush canvas for efficiency 2018-04-10 14:24:36 -04:00
DD Liu
887f528b0a allow transparent paintbrush 2018-04-10 14:24:36 -04:00
DD Liu
80b4557741 Add size, remove alias from other canvases 2018-04-10 14:24:36 -04:00
DD Liu
ba51fe59a0 Draw lines. Fix raster layer missing when changing costumes. 2018-04-10 14:24:36 -04:00
DD
31561d8bda Add bitmap brush tool button 2018-04-10 14:22:47 -04:00
DD
9a5a273f5b drawing some dots 2018-04-10 14:22:47 -04:00
DD Liu
f8414c3cb9
Merge pull request #368 from Jacco/issue/155 
Replace png background with vector version (for #155)
 2018-04-10 11:20:14 -04:00
DD
2b267ba6e9 Fix tests 2018-04-10 10:38:55 -04:00
DD
8ffe666478 Merge branch 'develop' into convertToBitmap 2018-04-09 20:11:57 -04:00
DD
a6e7fb4251 update button state when undoing between modes, hide vector tools 2018-04-09 20:10:53 -04:00
DD
e5c582f86b Make sure to remove the bounding box when no items are selected 2018-04-09 17:49:39 -04:00
DD
6e4ab3191a Get undo/redo working 2018-04-09 17:47:11 -04:00
DD Liu
6d11c9988a
Merge pull request #356 from fsih/eraserDisappears 
Bring back eraser after snapshot
 2018-04-09 13:25:12 -04:00
Jacco Kulman
0753b7ccc1 Added a comment (TRAVIS took wrong version) 2018-04-07 08:42:32 +02:00
Jacco Kulman
d0536be3ae Fixes (const instead of let) to satisfy TRAVIS 2018-04-07 08:25:33 +02:00
Jacco Kulman
b7f0551fac Fixes (whitespace, semicolons) to satisfy TRAVIS 2018-04-07 08:20:59 +02:00
Jacco Kulman
e64f015489 Replace png background with vector version 2018-04-07 07:59:52 +02:00
DD
15053d15f0 convert to vector on button press 2018-04-06 16:57:59 -04:00
DD
94ae07f1f2 Bitmap button rasterizes 2018-04-06 16:23:43 -04:00
DD
436bad4826 fix nudge 2018-04-06 10:57:40 -04:00
DD
82d2e30cae Add raster layer 2018-04-05 17:37:40 -04:00
DD
aff5866391 Remove unneeded applyMatrix 2018-04-04 14:50:11 -04:00
DD Liu
2e5aee5ff5
Merge pull request #359 from Jacco/issue/332 
Issue/332 Rotate-tool fix
 2018-04-04 14:42:19 -04:00
Jacco Kulman
c0c3531e4c Fixed issue with simplification 2018-04-04 19:36:58 +02:00
DD Liu
6c6d3a8bfb
Merge pull request #337 from Jacco/issue/301 
Reduce target when fill hole with same color #301
 2018-04-03 18:56:58 -04:00
DD
2b840c2f47 Add ability to fill transparent text 2018-04-03 18:21:12 -04:00
Jacco Kulman
c9d5b7d3a7 Ungrouping should not reduce CompoundPaths with 1 child 2018-04-03 23:12:24 +02:00
Jacco Kulman
e4c73da4ba Trailing space removed (Travis fix) 2018-04-03 22:54:36 +02:00
Jacco Kulman
f544a5e1f6 Simplification wwas incomplete 2018-04-03 22:36:49 +02:00
Jacco Kulman
ffc1da3b8e Rotation tool shift fix + simplification 2018-04-03 22:32:46 +02:00
DD
1a2c297c7b bring back eraser after snapshot 2018-04-02 18:50:35 -04:00
Paul Kaplan
769c6560e4 Fix leading 2018-03-29 15:58:22 -04:00
Paul Kaplan
5c0219e745 Use scratch 2 default font 2018-03-29 11:46:02 -04:00
Paul Kaplan
42abd4a33c
Merge pull request #336 from Jacco/issue/179 
Line connect guide size remains same when zooming #179
 2018-03-28 08:58:15 -04:00
Paul Kaplan
af2c49e639 Fix double clicking to enter edit mode and clearing selection. 
The first was caused by the "lastMode" flag being stored after the
double click edit was done, causing it to immediately exit edit mode.
The second problem was that the selection should be cleared when
entering edit mode on another text area.
 2018-03-26 11:23:55 -04:00
Jacco Kulman
a98ba28152 Fix 2 TRAVIS errors (whitespace, let) 2018-03-26 14:53:33 +02:00
Jacco Kulman
f707af70fd When removing a hole, the parent should be reduced before fillColor is set 2018-03-26 13:46:25 +02:00
Jacco Kulman
0198265fb8 The radius of the circle is now divided by paper.view.zoom, and the strokeWidth also. (Fixes #179) 2018-03-26 13:30:11 +02:00
DD
b98708ff70 Make clicking outside of the canvas activate select mode. This way the user can change the fill color easily, instead of the text getting deselected as soon as they click fill. 2018-03-22 17:56:54 -04:00
DD
6bfc3f23df Don't apply outline to text by default 2018-03-22 17:53:17 -04:00
DD
baf628c5c9 Detect view bounds changes and update the edit text matrix in response 2018-03-22 15:23:51 -04:00
DD
0c4f545326 Add transform when zoomed in 2018-03-22 14:34:46 -04:00
DD
c75d3f63ba Add undo 2018-03-22 14:31:03 -04:00
DD Liu
86ee3d8cdd Edit text moves with text transform 2018-03-22 11:07:10 -04:00
DD
1d29a7dceb Showing text on top of other text 2018-03-20 17:26:27 -04:00
DD
da0864b81b Add a text edit area 2018-03-20 14:47:14 -04:00
DD Liu
724fe85645
Merge pull request #325 from fsih/unfocusText 
Unfocus text fields when canvas clicked and don't take keystrokes in canvas when text fields are focused
 2018-03-20 14:06:59 -04:00
DD
44eedfe225 Remove unnecessary changes 2018-03-19 14:50:05 -04:00
DD
b4294b8268 Merge branch 'develop' into textTool 2018-03-19 12:43:44 -04:00
DD
a03567ef18 Switch to .1 2018-03-16 14:23:59 -04:00
DD
69e73d45dd Use .25 2018-03-16 14:18:42 -04:00
DD
79e7d21023 Change proptype 2018-03-16 14:16:27 -04:00
DD
8d61a7b060 Move the text edit target to the state and make fill work 2018-03-16 11:39:09 -04:00
DD
7a0a0784e1 Unfocus text fields when canvas clicked 2018-03-15 13:23:03 -04:00
DD
de0f12074d Unfocus text fields when canvas clicked 2018-03-15 13:20:07 -04:00
DD
254bbe1285 Ignore nudge when text field focused 2018-03-15 13:19:05 -04:00