scratchfoundation/scratch-paint
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-paint.git synced 2024-12-23 14:02:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
426 commits 89 branches 1007 tags 167 MiB
Commit graph

320 commits

Author SHA1 Message Date
Matthew Taylor
1963d9d0db Merge branch 'issue/edit-field-ui' of https://github.com/mewtaylor/scratch-paint into develop 
* 'issue/edit-field-ui' of https://github.com/mewtaylor/scratch-paint:
  Hide rotation point button for now
  Add UI formatting for edit fields

# Conflicts:
#	src/components/paint-editor/paint-editor.jsx
 2017-10-23 17:08:56 -04:00
Matthew Taylor
f44bd4b7fd Hide rotation point button for now 
thanks @fsih!
 2017-10-23 15:56:38 -04:00
Ray Schamp
82386c2c88 Merge pull request #78 from rschamp/costume-on-submit 
Add props for name, onUpdateName, and svgId
 2017-10-23 11:56:34 -04:00
DD Liu
1caf47a891 Merge pull request #86 from fsih/deleteShapes 
Delete shapes
 2017-10-23 11:27:03 -04:00
DD Liu
c2f561829e Merge pull request #85 from fsih/ovalTool 
Oval mode
 2017-10-23 11:16:39 -04:00
Matthew Taylor
2fe9ac12a7 Add UI formatting for edit fields 
This adds formatting and icons to the edit field buttons at the top of the ui, as well as some additional components for abstraction – such as `InputGroup`, `ButtonGroup` and `EditFieldButton` (which is a subcomponent of the paint editor)
 2017-10-23 10:35:30 -04:00
DD Liu
7e5c14a982 Merge pull request #87 from fsih/fixApplyStrokeColor 
Fix color matching logic in apply stroke color
 2017-10-23 09:13:19 -04:00
Ray Schamp
138718008c Add SVG id prop to track costume changes 
Since the editor will receive an update every time the svg is updated, only re-render if the actual svg id changes.
 2017-10-21 16:15:55 -04:00
Ray Schamp
303b4caced Add props for name/onUpdateName 2017-10-21 16:15:55 -04:00
Paul Kaplan
6e9a2ef178 Merge pull request #81 from fsih/rectTool 
Rectangle drawing tool
 2017-10-20 15:57:52 -04:00
DD
30e21e5d1c Fix color matching logic in apply stroke color 2017-10-20 15:57:48 -04:00
Paul Kaplan
65dbf70fa1 Merge pull request #84 from mewtaylor/issue/gh-83 
Fix GH-83: Move paint-specific styling out of button
 2017-10-20 15:57:38 -04:00
DD
059eb1fc1d hook up delete key for rect and oval 2017-10-20 15:19:14 -04:00
DD
cc350e9056 oval mode 2017-10-20 15:01:25 -04:00
DD
4fcb908ad5 Fix another issue caused by undo causing layers to be selected 2017-10-20 14:54:21 -04:00
Matthew Taylor
79661622fc Move paint-specific styling out of button 
Fixes #83 by making sure the copied-over button component has the same styling as in gui too, and move specifics to composing components
 2017-10-20 14:29:49 -04:00
DD
7f4812ad55 remove debug 2017-10-20 14:19:52 -04:00
DD
d6fc238359 Fix an issue where undoing when there is a bounding box would cause the whole layer to be selected 2017-10-20 14:19:52 -04:00
DD Liu
dbe24ed50c lint and clean up some things 2017-10-20 14:19:52 -04:00
DD
6732483d80 Add selection tool to rect 2017-10-20 14:19:52 -04:00
DD
f95bbe2ca5 Basic rectangle tool 2017-10-20 14:19:52 -04:00
DD
f9772e90ed Remove hover. Why did I leave hover in all of these 2017-10-20 14:19:02 -04:00
DD Liu
4580fcc7d8 Merge pull request #71 from fsih/penTool 
Pen tool
 2017-10-20 14:18:04 -04:00
DD
b62c2e32cb remove references to hover 2017-10-20 14:17:10 -04:00
DD
131193ef73 Pen tool 2017-10-20 14:17:10 -04:00
DD Liu
29ca6c66cf Merge pull request #70 from fsih/lineToolSnapping 
Line tool snapping
 2017-10-20 14:16:51 -04:00
DD
b79bb8174f found a better fix than the in handle = null thing 2017-10-20 14:16:23 -04:00
DD Liu
da15ed392a Merge pull request #73 from fsih/eraseThroughGroups 
Allow erase through groups
 2017-10-20 14:15:54 -04:00
DD
021930eadc fix lines getting curved when joining paths 2017-10-20 13:36:57 -04:00
DD
70ff3b656f Fix allowing connecting lines with end points that are very close together 2017-10-20 12:02:28 -04:00
Paul Kaplan
8a5e59dd44 Merge pull request #79 from mewtaylor/issue/tool-select-ui 
Add svg icons to tool select components
 2017-10-20 11:41:24 -04:00
Matthew Taylor
26dbb30a83 update css paths 2017-10-19 16:40:00 -04:00
Matthew Taylor
b1ca3f29d5 Rename paint-editor to new folder too 
and update click tests to just look at the base component
 2017-10-19 16:37:39 -04:00
Matthew Taylor
1abb10d320 change comment style to match other files 2017-10-19 15:41:59 -04:00
Matthew Taylor
2e0b34a325 Add svg icons to tool select components 
This also adds a generic `tool-select` component which can be composed by each of the individual tools for presentation purposes.

Towards #40.
 2017-10-19 15:08:15 -04:00
DD
e425fc6dcb Allow erase through groups 2017-10-19 11:48:14 -04:00
chrisgarrity
ced3563fda Adding scratch-l10n dependency 
* Added .tx configuation to be able to send source strings to transifex
* added dependency on scratch-l10n 2.x, and removed everything related to generating the l10n messages locally
* updated playground intl reducer to use paint messages from l10n package
 2017-10-19 08:34:13 -04:00
DD
1c3d5d72f9 rename style path to style blob and use style path for line tool 2017-10-18 19:21:29 -04:00
DD
d27aa53fca Fix line tool 2017-10-18 14:08:03 -04:00
DD
05d7b806a6 fix a bunch of things around import and export 2017-10-16 19:37:48 -04:00
DD Liu
c49a469eda Merge pull request #67 from fsih/toolButtons 
Tool buttons
 2017-10-16 16:32:38 -04:00
DD
946b6b0d87 Add back caveat for fully selected shapes, since code to remove handles when a shape is fully selected is in the paper fork we are using 2017-10-16 14:38:05 -04:00
DD
ce53a2c77e Add oval, rect, rounded rect buttons that do nothing 2017-10-16 14:33:11 -04:00
DD
d2881b2d15 Add pen tool that does nothing. Move blob tools to helper folder. 2017-10-16 14:18:04 -04:00
Paul Kaplan
fb11d5dd5e Merge pull request #59 from paulkaplan/color-picker 
Color picker
 2017-10-16 08:52:09 -04:00
Paul Kaplan
e2e4823642 Fix with feedback from DD 2017-10-13 14:24:07 -04:00
Paul Kaplan
3eaf8047aa Initial prototype of color picker 2017-10-13 13:34:25 -04:00
DD
4077fe828c use scratch fork of paper 2017-10-12 18:35:30 -04:00
DD
ae3c0f1eed Fix lint 2017-10-12 11:28:23 -04:00
DD
64c6ddedaf Fix bugs during select and drag 2017-10-12 11:28:23 -04:00
DD Liu
e79faa79d1 Merge pull request #51 from fsih/fixImport 
Fix import
 2017-10-12 11:26:14 -04:00
DD
9242faffa6 fix typo 2017-10-12 11:23:35 -04:00
DD
49b197eba2 Revert "remove the default imported costume" 
This reverts commit 879297ca95640b41e3e1fbe989a6323912bd7470.
 2017-10-12 11:23:35 -04:00
DD
1d0ffef40f Revert "Make unimplemented buttons grey" 
This reverts commit c320a0b6416887b916853d6265cc123bca776b57.
 2017-10-12 11:23:35 -04:00
DD
affe8463be fix undo removes cursor preview 2017-10-12 11:23:35 -04:00
DD
4d9ecb2a2c fix lint 2017-10-12 11:23:35 -04:00
DD
4d0e2b4c44 remove the default imported costume 2017-10-12 11:23:35 -04:00
DD
01d1ddec9d Make unimplemented buttons grey 2017-10-12 11:23:35 -04:00
DD
87eb78ad49 update stage on undo and redo 2017-10-12 11:23:35 -04:00
DD
7523af09f0 add missing file 2017-10-12 11:23:35 -04:00
DD
345a43e127 merge onUpdateSvg and undoSnapshot 2017-10-12 11:23:35 -04:00
DD
4300924671 clean up unused things in selection so I dont have to add undo to them 2017-10-12 11:23:35 -04:00
DD
28464b237b call undo 2017-10-12 11:23:35 -04:00
DD
8baf731328 add undo reducer 2017-10-12 11:22:40 -04:00
DD
cb34c29db6 Fix some issues with import not centering costume 2017-10-11 17:48:21 -04:00
DD
f7cd7fc54d fix function 2017-10-11 11:58:05 -04:00
DD
ab244a5e4c convert getSelectedItems(recursive) to 2 functions 2017-10-11 11:32:51 -04:00
DD
60a310ae85 remove unused 2017-10-03 18:13:12 -04:00
DD
aa2b70f1e7 Add missing clearSelectedItems function to blob 2017-10-03 17:53:06 -04:00
DD
e4f1a5ad28 clean up and add comment 2017-10-03 15:17:27 -04:00
DD
720f83605d add tests 2017-10-03 15:04:53 -04:00
DD
7a9399d0db fix lint 2017-10-03 13:45:19 -04:00
DD
b87c17523a Selection sets and gets fill/stroke color/width 2017-10-03 12:07:56 -04:00
DD
6bcd59f388 add comments 2017-09-22 14:14:48 -04:00
DD
33236f198d fix hit testing 2017-09-22 14:08:19 -04:00
DD
33d8dd30b5 release things on deactivate 2017-09-22 14:02:43 -04:00
DD
32661dde92 switch to use id instead of hovered item 2017-09-22 13:56:58 -04:00
DD
7e1375d855 Switch state to track hover item ID instead of item itself 2017-09-22 13:48:48 -04:00
DD
3bb606e16a move hit options declaration into function 2017-09-22 12:31:39 -04:00
DD
adbd023551 fix being able to select subgroups again 2017-09-22 12:22:20 -04:00
DD
5db66af0a1 add comments and clean up 2017-09-22 12:12:24 -04:00
DD
dc66283bd2 Fix select tool being able to select sub pieces of groups, fix bounding box showing after delete 2017-09-22 11:12:27 -04:00
DD
340316565b add select tool file 2017-09-21 18:39:18 -04:00
DD
4bc4d92415 Move select tool out of select mode 2017-09-21 18:39:00 -04:00
DD
f15a3dbe02 Add reshape 2017-09-21 10:36:26 -04:00
DD
b8de3dcc3a Add reshape button 2017-09-18 11:28:43 -04:00
DD
9a09c4324d the declarations done to avoid lint errors actually broke hover, so put them back 2017-09-14 17:53:28 -04:00
DD
67ac013edf prune unused function and lint 2017-09-14 14:34:45 -04:00
DD
25478a87fb add tests 2017-09-14 11:56:12 -04:00
DD
6048c9f866 hook into other tools 2017-09-13 17:58:27 -04:00
DD
3fa8073bd1 get scale working 2017-09-13 17:45:06 -04:00
DD
9216098a3f get rotate working 2017-09-13 16:59:37 -04:00
DD
0e91439edd Get move working 2017-09-13 15:17:59 -04:00
DD
3126c2ca7f correct stroke width type" 2017-09-12 17:43:53 -04:00
DD
448ff9bfe4 Add more selection files 2017-09-12 17:39:25 -04:00
DD
ef367646fb Merge branch 'strokeWidth' into select 2017-09-11 14:01:35 -04:00
DD
4e29f31639 convert container to not a component 2017-09-11 13:54:48 -04:00
DD
9f40c633f8 Merge branch 'fillStrokeColor' into strokeWidth 2017-09-11 13:53:12 -04:00
DD
d9b683b42c remove tab index 2017-09-11 13:36:07 -04:00
DD
499635ddf1 convert containers to mysterious non-components 2017-09-11 13:28:35 -04:00
DD
2c98f61d69 Merge branch 'develop' into fillStrokeColor 2017-09-11 11:29:32 -04:00
DD
2121a4f438 Add comments on copied files 2017-09-11 11:13:43 -04:00
DD
a05fb5463b remove sound editor specific CSS 2017-09-11 11:05:02 -04:00
DD
cf75703580 In-progress add select mode 2017-09-11 10:52:00 -04:00
DD
a2cd53b159 add stroke width indicator 2017-09-08 11:52:36 -04:00
DD
e0ed034044 don't apply stroke color to brush 2017-09-08 11:41:40 -04:00
DD
6f11c5ec1c don't apply stroke color to brush 2017-09-08 11:41:21 -04:00
DD
ce8fdaac1c pipe through stroke color 2017-09-07 18:36:35 -04:00
DD
74ff77a38d add stroke color to state 2017-09-07 17:59:14 -04:00
DD
1088de519f nest fill color in a color state. Pipe fill color to brush 2017-09-07 17:49:41 -04:00
DD
9e4c510372 add fill color component 2017-09-07 17:12:50 -04:00
DD
f96c26ddbe newlines 2017-09-06 18:10:19 -04:00
DD
4c6898657b Bring in buffered input from GUI 2017-09-06 18:01:49 -04:00
DD
09dad3df7d Merge branch 'develop' into structure 2017-09-06 15:25:49 -04:00
DD
23693f3764 get rid of null check, since onUpdateSvg is required 2017-09-05 18:00:41 -04:00
DD
36016bbd11 Handle removing the viewbox and centering 2017-09-05 15:53:26 -04:00
DD
b0d29a946b Pipe through updateSvg and call it whenever a tool finishes an action 2017-08-30 18:43:34 -04:00
DD
162bf7e335 Merge branch 'develop' into importExport 2017-08-30 14:52:47 -04:00
DD
c228a191cb fix lint 2017-08-30 10:56:30 -04:00
DD
cf19fc556f Merge branch 'develop' into addLine 2017-08-30 10:51:25 -04:00
DD
bb71f56817 css 2017-08-30 10:50:24 -04:00
DD
633ecd2399 load an svg string 2017-08-30 10:50:05 -04:00
DD
2c64c45101 fix lint errors 2017-08-29 17:24:40 -04:00
DD
82fc11ebab add structure 2017-08-29 17:20:08 -04:00
DD
ad5df04f1e Changes to the webpack build to make paint compatible with installing into gui 2017-08-28 18:16:35 -04:00
DD
dd27974d07 clean up in deactivate 2017-08-25 14:00:30 -04:00
DD
cc50a14e1d Merge branch 'develop' into addLine 2017-08-25 13:55:19 -04:00
DD
7989387078 Merge branch 'develop' into addLine 2017-08-25 11:35:05 -04:00
a622d0d3e9 add tests 2017-08-24 17:49:22 -04:00
DD Liu
c2cae279b7 Add line mode 2017-08-23 19:01:29 -04:00
DD Liu
4c528a6ad9 Merge branch 'addButtons' into addI18n 2017-08-23 11:00:46 -04:00
DD Liu
8616e49f1a change comment 2017-08-23 10:56:37 -04:00
DD Liu
9521203e19 move the intl stuff to playground 2017-08-22 18:22:59 -04:00
DD Liu
ac024c6c6b make helper mouse functions have consistent interface 2017-08-22 16:39:34 -04:00
DD Liu
b40ccd46a9 make helper mouse functions have consistent interface 2017-08-22 16:29:50 -04:00
DD Liu
11d43e0006 add i18n support 2017-08-21 17:58:38 -04:00
DD Liu
ff77bb6a3d add rendered components for brush and eraser 2017-08-17 18:13:24 -04:00
DD Liu
6ede893585 Bring over new bug fixes from papergrapher 2017-08-17 16:50:30 -04:00
DD Liu
a875bee81c move blob helper files 2017-08-17 13:53:54 -04:00
DD Liu
f325ae43ee move isEraser to options 2017-08-17 13:40:39 -04:00
DD Liu
4ea7d154ee Change broad brush helper and segment brush helper into their own classes, instead of adding functions to tool 2017-08-16 17:44:52 -04:00
DD Liu
33a01c1396 make modes independent of tool. Fix tests 2017-08-16 15:34:33 -04:00
DD Liu
087a6264a0 rename stuff from tool to mode so it isn't confused with paper.tool' 2017-08-15 18:11:13 -04:00
DD Liu
69666f3b8a smooth the motion of large brushes 2017-08-01 11:21:26 -04:00
DD Liu
6e27d133a8 remove throttles 2017-07-27 23:05:43 -04:00
DD Liu
975bfdc464 add tests 2017-07-27 22:58:31 -04:00
DD Liu
27f7102b06 add segment brush 2017-07-27 17:36:17 -04:00
DD Liu
0c1e7ed961 some comments 2017-07-27 16:48:37 -04:00
DD Liu
dc2fea3dd6 some clean up in react code' 2017-07-27 16:41:41 -04:00
DD Liu
c7471d26ab Merge branch 'addTool' into addEraser 2017-07-27 11:45:41 -04:00
DD Liu
a4891d22b0 code review 2017-07-27 00:34:33 -04:00
DD Liu
dc683f1d82 switch to jest 2017-07-26 20:48:35 -04:00
DD Liu
0b3798436f random change 2017-07-25 15:35:32 -04:00
DD Liu
f139bfada0 fix cursor preview 2017-07-25 15:00:35 -04:00
DD Liu
530b2d76f4 fix name 2017-07-25 11:54:17 -04:00
DD Liu
02730cbd58 add eraser 2017-07-25 11:53:54 -04:00
DD Liu
469c60e66c Merge branch 'addTool' into addBrush 2017-07-25 11:36:10 -04:00
DD Liu
abf851dff0 add newline 2017-07-25 11:35:56 -04:00
DD Liu
eb060b1dc7 Merge branch 'develop' into addTool 2017-07-25 11:27:01 -04:00
DD Liu
289defbaf9 Merge branch 'develop' into addBrush 2017-07-25 11:25:54 -04:00
DD Liu
6d0119eebe add missing file 2017-07-25 10:22:31 -04:00
DD Liu
014907ba98 get broad brush working 2017-07-20 22:49:05 -04:00
DD Liu
4bd8343338 change export syntax 2017-07-18 14:41:40 -04:00
DD Liu
f245114f51 add logging and test 2017-07-18 14:35:58 -04:00
DD Liu
435f00b745 add state to switch tools, and keyboard shortcuts to do so 2017-07-17 18:39:50 -04:00
DD Liu
eba604d242 Add eslint config scratch 2017-07-17 14:20:32 -04:00
DD Liu
4e558380e7 add paper canvas component 2017-07-17 12:04:12 -04:00
DD Liu
0daa70fc7c Fix travis 2017-07-13 17:14:40 -04:00
DD Liu
836088a8cb Remove VM dependency 2017-07-13 14:47:23 -04:00
DD Liu
4cc251be24 Make a paint editor component 2017-07-13 14:03:48 -04:00