Paul Kaplan
4fce383349
Merge branch 'develop' into wheel-pan-zoom
2017-10-27 10:35:19 -04:00
Paul Kaplan
82928a51b9
Merge branch 'develop' into wheel-pan-zoom
2017-10-27 10:27:20 -04:00
Paul Kaplan
7fa1a7ca26
Merge pull request #115 from mewtaylor/issue/user-select
...
Fix GH-98: Remove user select state from form fields in paint
2017-10-27 10:25:07 -04:00
Paul Kaplan
62526889c9
Remove wheel listeners from brush and eraser
2017-10-27 10:22:52 -04:00
Paul Kaplan
d4b28a8817
Remove scroll action on eraser and brush
2017-10-27 10:16:13 -04:00
Paul Kaplan
770a138e21
Fix linting
2017-10-27 10:06:01 -04:00
Paul Kaplan
62fad01607
Increase zoom button increment
2017-10-27 10:05:21 -04:00
Paul Kaplan
9ac6b0b048
Save and restore project pan and zoom correctly between costume changes
2017-10-27 09:59:57 -04:00
Paul Kaplan
da12930e00
Fix linting
2017-10-27 09:33:06 -04:00
Paul Kaplan
94b90e104b
Add basic zooming and panning from mousewheel
2017-10-27 09:12:31 -04:00
Matthew Taylor
bbf47b8eeb
Remove user select state from form fields in paint
...
Also add a pointer curser to the color-button html elements so that it’s clear those are clickable
2017-10-27 08:37:28 -04:00
Paul Kaplan
c1ce433f72
Merge pull request #112 from paulkaplan/transparent-state
...
Fix several color state inconsistencies
2017-10-27 08:20:09 -04:00
Paul Kaplan
e4387739a5
Remove not required prop
2017-10-26 18:17:33 -04:00
Paul Kaplan
433baae5ba
Fix linting
2017-10-26 18:16:14 -04:00
Paul Kaplan
68c6f69211
Add box to make outline different from fill button
2017-10-26 18:09:27 -04:00
Paul Kaplan
ab3b4e4555
Force a stroke width on pen and line mode
2017-10-26 17:43:06 -04:00
Paul Kaplan
b8aadc3c54
Disable fill or outline indicators for brush, line and pen mode.
2017-10-26 17:43:06 -04:00
Paul Kaplan
40ec57fbf1
Force a real color when activating brush, pen and line mode.
2017-10-26 17:43:06 -04:00
Paul Kaplan
d98a493954
Add initial transparent and mixed icons for color buttons and swatch
2017-10-26 17:43:06 -04:00
DD Liu
c67459da0a
Merge pull request #111 from fsih/brushColor2
...
Never mind, it was supposed to be looks purple
2017-10-26 16:42:11 -04:00
DD
7c8c9aa23d
change default color to looks purple
2017-10-26 16:41:01 -04:00
DD Liu
533893fa4e
Merge pull request #110 from fsih/brushColor
...
Change default fill color to motion blue
2017-10-26 16:32:56 -04:00
DD
ad28e1ff16
Change default fill color to motion blue
2017-10-26 15:58:02 -04:00
Matthew Taylor
162ca81ff9
comment out currently disabled imports
2017-10-26 15:48:20 -04:00
DD Liu
b2eb47d7f2
Merge pull request #107 from fsih/backspace
...
Don't delete when input field focused
2017-10-26 15:44:19 -04:00
Matthew Taylor
b7f0df5214
Merge branch 'issue/disabled-state' into develop
...
* issue/disabled-state:
comment out disabled mode tools for now
Change border on disabled undo/enabled redo
pass props to button from labeled button
Add undo/redo disabled states
Have the paint-editor container listen to `selectedItems`
Add bool to `disabled` prop type
Add disabled state for button
# Conflicts:
# src/containers/paint-editor.jsx
2017-10-26 15:32:43 -04:00
Matthew Taylor
0f726c9d40
comment out disabled mode tools for now
2017-10-26 14:20:39 -04:00
Matthew Taylor
cdb235a876
Change border on disabled undo/enabled redo
...
thanks @fsih
2017-10-26 14:03:09 -04:00
DD
6e589e8f81
case
2017-10-26 12:05:54 -04:00
DD
2019196256
Do onUpdateSvg only once on changing stroke width
2017-10-26 11:28:10 -04:00
DD
7ca851985e
Move delete out of tools so its always available
2017-10-26 11:25:38 -04:00
Matthew Taylor
9ef967aa24
pass props to button from labeled button
...
so that we don’t have to check for things like `disabled` twice.
2017-10-26 11:02:01 -04:00
Matthew Taylor
7b783a5c46
Add undo/redo disabled states
2017-10-26 10:58:28 -04:00
Matthew Taylor
2376a3ce63
Have the paint-editor container listen to selectedItems
...
This solves the issue of buttons not updating their disabled/enabled state until being dragged by making sure that a re-render occurs whenever a new item is selected, checking again for state.
2017-10-26 09:28:01 -04:00
Matthew Taylor
128f9ca642
Add bool to disabled prop type
...
fixes a warning that @paulkaplan noticed, thanks!
2017-10-26 09:26:54 -04:00
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
a38b1f6121
Add disabled state for button
...
This implements #47 by adding a disabled state to the button component, and then by applying it to top row buttons for group/ungroup, and front/back forward/backward.
2017-10-25 16:44:04 -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
