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
787 commits 90 branches 1006 tags 166 MiB
Commit graph

579 commits

Author SHA1 Message Date
DD Liu
d71ca021f1
Hide top row buttons in bitmap mode (#423) 2018-05-03 14:23:00 -04:00
DD Liu
10d35d066c
Fix costume string description (#422) 2018-05-03 10:53:43 -04:00
Paul Kaplan
aef0a03b77
Merge pull request #416 from paulkaplan/fix-edge-button-text 
Fix button text wrapping in Edge
 2018-05-02 15:16:11 -04:00
DD Liu
c00234c1a7
Fix image conversion in firefox and add fallback (#417) 2018-05-02 15:09:05 -04:00
Paul Kaplan
4cf7349126 Fix button text wrapping in Edge 2018-05-02 14:57:38 -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 Liu
af29e606d8
Merge pull request #405 from fsih/lineTool 
Add line tool
 2018-04-26 16:36:17 -04:00
DD
ed114bb073 Move getBrushMark to helper 2018-04-26 14:54:44 -04:00
DD
86bec30790 Remove ungroup on import 2018-04-26 11:00:28 -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
b93f902827 double defaults 2018-04-20 11:17:42 -04:00
DD Liu
8d55265de1 Double resolution on import and halve on export 2018-04-20 11:17:42 -04:00
DD Liu
57f3be36ec
Merge pull request #391 from fsih/tooltips 
Tooltips
 2018-04-20 11:14:26 -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
bfb3948244 Add coming soon tooltips to other tools 2018-04-18 15:03:34 -04:00
DD
15c3f44388 Fix lint 2018-04-17 15:55:40 -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
2043ee4609 Merge branch 'develop' into raster 2018-04-12 14:33:26 -04:00
DD
64686feb8b review comments 2018-04-12 14:27:07 -04:00
DD
c9c04745bc Hide stroke indicators in bitmap mode 2018-04-12 14:23:19 -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
a868d29d82 Add tool to bitmap editor 2018-04-11 18:04:55 -04:00
DD
8622bfab69 Merge branch 'develop' into convertToBitmapShapeRendering 2018-04-11 15:50:39 -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
a4045df526 Anti-anti-alias 2018-04-10 19:06:47 -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
0529c43c25 Change back to vector when switching costumes 2018-04-09 20:21:04 -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
f995f30e37 Button toggles on switch format 2018-04-06 11:52:34 -04:00
DD
436bad4826 fix nudge 2018-04-06 10:57:40 -04:00
DD
2b8c291765 Add format reducer 2018-04-05 18:06:37 -04:00
DD
e6b151c41f Re-enable convert to bitmap button 2018-04-05 18:04:29 -04:00
DD
82d2e30cae Add raster layer 2018-04-05 17:37:40 -04:00
DD
0bf2355cbc Make raster not blurry on zoom 2018-04-05 17:37:19 -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
alex
2397135a3a
Merge branch 'develop' into fix-editorconfig-indent 2018-04-03 01:12:45 +01:00
DD
1a2c297c7b bring back eraser after snapshot 2018-04-02 18:50:35 -04:00
DD Liu
0ff5ad991a
Merge pull request #264 from heyitsmeuralex/use-font-playground 
Use sans-serif font in playground
 2018-04-02 11:00:16 -04:00
Paul Kaplan
985d847a89
Merge pull request #353 from paulkaplan/disable-keyboard-shortcuts 
Fix disable keyboard (woops...)
 2018-03-30 13:17:03 -04:00
Paul Kaplan
943d64b437 Fix keyboard disabling 2018-03-30 13:16:11 -04:00
Paul Kaplan
7399d7d8f8
Merge pull request #352 from paulkaplan/disable-keyboard-shortcuts 
Disable keyboard shortcuts because they interfere with text tool
 2018-03-30 13:07:02 -04:00
Paul Kaplan
848aa7e838 Disable keyboard shortcuts because they interfere with text tool 2018-03-30 13:00:11 -04:00
Paul Kaplan
769c6560e4 Fix leading 2018-03-29 15:58:22 -04:00
Paul Kaplan
449192ebb3 Remove the preprocessing step of stripping newlines. 
It does not seem to be required anymore: I'm no longer seeing errors
from the watermelon.

It was breaking multiline text import from scratch 2 SVGs which use
newlines.
 2018-03-29 11:46:56 -04:00
Paul Kaplan
5c0219e745 Use scratch 2 default font 2018-03-29 11:46:02 -04:00
Paul Kaplan
b1447b01da
Merge pull request #335 from Jacco/issue/219 
Redraw select bounding box controls on zooming #219
 2018-03-28 08:58:40 -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
d9587ba8d7
Merge branch 'develop' into issue/219 2018-03-28 08:51:54 -04:00
alex
f5e17adad3 Fix editorconfig indentation rules 2018-03-26 17:17:29 +01:00
alex
ef78584045 Fix codestyle 2018-03-26 17:12:28 +01: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
5593b03074 Added the setSelectedItems call for wheel zooming 2018-03-26 16:40:59 +02: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
Jacco Kulman
3afd232aea Call setSelectedItems from zoom functions (Fixes #219) 2018-03-26 12:59:26 +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
865554d7f3 lint 2018-03-22 17:20:39 -04:00