scratchfoundation/scratch-paint
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-paint.git synced 2024-12-22 21:42:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
273 commits 89 branches 1004 tags 165 MiB
Commit graph

273 commits

This branch
This branch
All branches
Author SHA1 Message Date
DD Liu
4e7a1fab40 Merge pull request #97 from fsih/crosshair 
Add the background guide layer
 2017-10-25 17:26:47 -04:00
DD
8fccfb3dc3 Use content-box so that we dont have edges around the border 2017-10-25 16:47:56 -04:00
Matthew Taylor
1459593b2b Merge pull request #99 from mewtaylor/issue/gh-36 
Implement GH-36 and GH-37: Add basic eraser and brush size picker
 2017-10-25 15:49:36 -04:00
Matthew Taylor
c1862284ff Remove unused reference 2017-10-25 15:23:30 -04:00
DD
67562c8799 Use a raster for the guid layer background 2017-10-25 14:47:40 -04:00
Matthew Taylor
117c24787a remove unused reference 2017-10-25 14:36:08 -04:00
Matthew Taylor
e2fd966ae9 Increase max size to 1 2017-10-25 14:22:36 -04:00
Matthew Taylor
3574918f23 Add comment, and adjust handleChange() 
make `e.target.value` the submitted thing, rather than `this.props.value`
 2017-10-25 14:15:02 -04:00
Matthew Taylor
90c485ba23 remove half-baked slider stuff 
whoops!
 2017-10-25 13:51:57 -04:00
Matthew Taylor
ea36e10577 Add basic eraser and brush size picker 
this implements the first version of #36 and #37, in which the brush size picker is a numeric input field rather than a slider.
 2017-10-25 13:37:41 -04:00
DD
29f5cc7216 fix undo snapshotting with the background guide layer 2017-10-24 17:37:55 -04:00
DD
29a3d74143 Add the background guide layer 2017-10-24 17:12:44 -04:00
Paul Kaplan
706a9c101d Merge pull request #95 from paulkaplan/mode-order 
Update default mode to select and mode button order
 2017-10-24 16:29:52 -04:00
Paul Kaplan
4d0f3e8311 Update default mode in reducer 2017-10-24 15:52:39 -04:00
Paul Kaplan
4e9108e8e3 Update default mode order 2017-10-24 15:51:57 -04:00
Paul Kaplan
748bd44cbc Merge pull request #92 from paulkaplan/update-color-language 
Change "Hue" to "Color" in color picker
 2017-10-24 15:01:14 -04:00
DD Liu
dacc17d6c4 Merge pull request #89 from fsih/group 
Add group/ungroup
 2017-10-24 13:50:07 -04:00
DD
251967fefb fix merge 2017-10-24 13:27:09 -04:00
DD
a538d10992 Add comments to group code 2017-10-24 13:26:43 -04:00
DD
083bf63869 Add group and ungroup 2017-10-24 13:26:43 -04:00
Matthew Taylor
091201756b 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-24 13:25:44 -04:00
DD Liu
75a2f804cc Merge pull request #91 from fsih/layerOrder 
Layer order
 2017-10-24 13:23:23 -04:00
Paul Kaplan
0bc3f12475 Change "Hue" to "Color" in color picker 2017-10-24 09:27:23 -04:00
Matthew Taylor
3fd72e775d remove svg for now 
fix lint error since this is not used while rotation point is not part of the ui
 2017-10-23 17:27:08 -04:00
DD
3b4f509f89 Implement ordering buttons 2017-10-23 17:20:35 -04:00
Matthew Taylor
c3f578c140 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 17:19:44 -04:00
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