Commit graph

741 commits

Author SHA1 Message Date
chrisgarrity
ec38552b32 Fix icon alignment when there are no labels 2018-07-18 14:21:39 -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
chrisgarrity
0ed3aaf3db Adjust format for different locales
* increased fullsize editor width, English required 1272, adding a couple more pixels allowed a couple of other languages to keep labels
* hide flip vertical/horizonal labels for everything except English
* hide all labels for languages defined in `hideLabel`
2018-07-16 14:34:36 -04:00
DD Liu
21f3a5f30c
Add missing props validation (#556) 2018-07-13 10:55:36 -04:00
DD Liu
4e4bb396a6
Draw oval and rectangle outlines in bitmap (#550) 2018-07-12 15:48:30 -04:00
Paul Kaplan
11bab6ebe2
Merge pull request #553 from paulkaplan/fix-conversion-button-styles
Make the bitmap/vector conversion button look enabled
2018-07-12 10:38:47 -04:00
Paul Kaplan
1d63bafedd Make the bitmap conversion button enabled always 2018-07-12 10:27:14 -04:00
DD Liu
652a3ca89b
Update image when deleting points (#551) 2018-07-11 14:10:03 -04:00
DD Liu
7063d359eb
Correct the view bounds when the paper canvas is initialized. (#549) 2018-07-11 11:13:27 -04:00
Paul Kaplan
179c68378b
Merge pull request #545 from paulkaplan/delete-button
Delete button
2018-07-09 09:17:37 -04:00
Paul Kaplan
64b71703ce Simplify the logic for reshape delete 2018-07-09 09:17:15 -04:00
Paul Kaplan
501f9806e6 Make fill and outline labels go above color buttons 2018-07-06 15:32:31 -04:00
DD Liu
90bc640dbb Fix reshape 2018-07-06 11:29:06 -04:00
Paul Kaplan
20228dfe0a Check for curved points as well as selected items for reshape delete 2018-07-06 11:27:48 -04:00
Paul Kaplan
fb460e3eb3 Add delete button for reshape tool also
The delete code already handles the pointwise deletion correctly, just needed to add it to the tool row
2018-07-05 14:17:20 -04:00
Paul Kaplan
a837b9ced6 Add delete button to mode tools for select tool 2018-07-05 14:16:43 -04:00
Paul Kaplan
74196228f1
Merge pull request #542 from paulkaplan/increase-tool-visibility
Increase selected tool visibility by making the icon white and bg blue.
2018-07-05 08:55:29 -04:00
Paul Kaplan
e772907023 Increase selected tool visibility by making the icon white and bg blue.
Resolves #375
2018-06-29 08:30:47 -04:00
Paul Kaplan
06a3ab7390
Merge pull request #537 from fsih/bitSelectTool
Bitmap select tool
2018-06-29 07:50:44 -04:00
DD Liu
e215b8a9b8 Fix issue with pasting vector into bitmap 2018-06-28 17:52:15 -04:00
Paul Kaplan
400f31e7ab Use the tool description as the button title to improve accessibility. 2018-06-28 09:54:49 -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
Florrie
0176dd7eed Fix scroll speed on Firefox (#532)
Copied from https://github.com/LLK/scratch-blocks/pull/1427/
2018-06-26 16:15:50 -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
e9deddba05
reungroup (#499) 2018-06-14 11:38:06 -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
5f8bca6b08 Prevent color pickers from sliding the UI 2018-06-13 16:38:47 -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
df93408196
Ungroup layer groups generated by paper (#453) 2018-05-21 11:55:01 -04:00
Ray Schamp
3df9c0862d
Revert "Temporarily hide the font dropdown" 2018-05-21 10:05:43 -04:00
Ray Schamp
638602bb0d Temporarily hide the text tool
This is for the GUI release to master today and should be reverted after that merge.
2018-05-21 09:46:03 -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
7f216defd2
Add todo to add viewbox (#446) 2018-05-16 15:34:00 -04:00
Paul Kaplan
40ccb3c75c Fix linting 2018-05-14 14:28:36 -04:00
DD Liu
830dd3c9ee
Use font inlining method from scratch svg render (#427) 2018-05-10 13:46:23 -04:00
DD Liu
fd6268c940
Queue perform snapshot (#430) 2018-05-09 10:51:49 -04:00
DD
b638b2b9ca Listen to undo state in fixedTools 2018-05-04 13:35:19 -04:00
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
DD
3782d5ad6e Add missing file 2018-03-22 16:22:38 -04:00
DD
b1d5111ed4 fix lint 2018-03-22 16:22:24 -04:00
DD
28da99bb05 Check for text area in a better way 2018-03-22 15:26:43 -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
cbd2a89cd0 Merge branch 'develop' into textTool 2018-03-20 14:16:47 -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
1c093df92b Only unblur inputs if you clicked on the paper canvas 2018-03-20 11:03:41 -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 Liu
de2d58fd79
Merge pull request #323 from fsih/playgroundSvg
Move the SVG in the playground back to the center of the editor
2018-03-16 15:08:03 -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
DD
76eb0b9e3e Reduce the overlap to .25 2018-03-14 18:12:37 -04:00
DD
8ecc426844 Move the SVG in the playground back to the center of the editor. It became offscreen when the definition of rotation center changed. 2018-03-14 18:01:15 -04:00
DD
f9aabe1beb Fix some bugs 2018-03-14 18:00:38 -04:00
DD
240282f9d2 Make the guide stay in the shape of the text when text is rotated 2018-03-14 16:01:20 -04:00
DD
f0b570dc51 Add dotted lines in text edit mode 2018-03-14 15:28:22 -04:00
DD
4fd9f991f1 Mode switching 2018-03-14 14:43:39 -04:00
DD
8e86222097 Basic text edit 2018-03-12 17:51:23 -04:00
DD
8e7ae67ae6 Make the text tool a real tool 2018-03-09 14:40:34 -05:00
DD
ccdb6431b5 Merge branch 'develop' into brushEfficiency 2018-03-08 11:43:50 -05:00
DD Liu
eff43e2eec
Merge pull request #304 from fsih/removePaperUpdate
Remove all view.draw and view.update
2018-03-06 16:24:45 -05:00
DD Liu
543c002329
Merge pull request #300 from fsih/undoLimit
Add an undo stack size limit to paint
2018-03-05 10:22:49 -05:00
DD
43b0bf40e5 Add jsdoc 2018-03-02 10:38:35 -05:00
DD
5783b69f0a Don't error if there are no segments 2018-03-01 17:14:09 -05:00
DD
0323451ebf Fix crash when missing cursor preview 2018-03-01 16:37:45 -05:00
DD
24b1359abf Make mouse movement accuracy depend on zoom level 2018-03-01 15:26:22 -05:00
DD
abe8deaa35 Make sure to clear the cursor preview when saving undo state so that it doesnt mysteriously return on undo 2018-03-01 14:41:39 -05:00