Matthew Taylor
88b2d3bf8f
remove space
...
apologies – this happened during the manual merge.
2017-11-06 09:07:18 -05:00
Matthew Taylor
8697922d3b
Merge branch 'issue/gh-122' into develop
...
* issue/gh-122:
check min too
Validate max value in live input
create liveinput hoc instead
change size inputs to input with custon onChange
# Conflicts:
# src/components/mode-tools/mode-tools.jsx
2017-11-06 08:11:48 -05:00
Matthew Taylor
e39b4edce1
check min too
2017-11-03 12:49:34 -04:00
DD Liu
5c9ab404cd
Merge pull request #177 from fsih/layerMixing
...
Try to make layer management more robust
2017-11-03 11:07:33 -04:00
Matthew Taylor
9eb3b7af39
Validate max value in live input
...
Also snap to max if the value is larger. Thanks @fsih!
2017-11-02 22:15:25 -04:00
DD
a9b55b9a22
Try to make layer management more robust
2017-11-02 17:19:42 -04:00
DD Liu
ffa4721e49
Merge pull request #118 from fsih/eraserDonuts
...
Fix erasing with holes
2017-11-02 14:27:49 -04:00
DD Liu
5626f72e85
Merge pull request #176 from fsih/copyPasteFunction
...
Add copy/paste functionality
2017-11-02 10:19:44 -04:00
DD
a5a60b0884
Offset the pasted item from the original when on the same costume
2017-11-01 18:10:03 -04:00
DD
cc920e8969
clear more of the state when you switch costumes. you shouldnt retain the same selected items
2017-11-01 17:23:20 -04:00
DD
7e1e8d96ac
add copy/paste
2017-11-01 17:05:37 -04:00
Matthew Taylor
d2952c2114
create liveinput hoc instead
...
this should solve the issue of being able to delete what you typed. Thanks!
2017-11-01 15:57:31 -04:00
DD Liu
80a58bb90f
Merge pull request #173 from fsih/copyPaste
...
Move copy/paste to mode tools
2017-11-01 15:12:02 -04:00
Matthew Taylor
7dbabf60a9
change size inputs to input with custon onChange
...
This fixes #122 by reverting the changes to `bufferedInputHOC`, and adding a custom `onChange` handler to the mode tools for brush and eraser, and making them `Input` components. Same goes for the strok width indicator.
2017-11-01 13:41:36 -04:00
DD
1a654a22ed
Move copy/paste to mode tools
2017-11-01 11:15:13 -04:00
Matthew Taylor
693f38d378
Merge pull request #171 from mewtaylor/issue/gh-134
...
Towards GH-134: Add disabled copy/paste buttons
2017-10-31 16:42:22 -04:00
Matthew Taylor
65b59f6e0a
fix typo
...
thanks @fsih!
2017-10-31 16:32:37 -04:00
Matthew Taylor
f2e031e787
make alt optional for labeled buttons
...
Also add labels to `defineMessages` for localization. Thanks @fsih!
2017-10-31 15:03:51 -04:00
Matthew Taylor
858a4fbef3
Add disabled copy/paste buttons
...
This is for #134 – adds copy/paste buttons to the second row of tools, and keeps them in a disabled state for now, while they’re not usable. It also moves icons into a subfolder, given their proliferation in the paint editor component
2017-10-31 13:45:09 -04:00
DD Liu
28b9c4149e
Merge pull request #169 from fsih/shapeColor
...
Force a color state when switching to shape tools
2017-10-31 10:27:59 -04:00
DD Liu
a35253c5e8
Merge pull request #168 from fsih/removePen
...
Remove pen
2017-10-31 10:24:29 -04:00
Matthew Taylor
949947c215
Merge pull request #170 from mewtaylor/issue/gh-131
...
Fix GH-131: Add a larger width on small inputs
2017-10-31 10:22:03 -04:00
Matthew Taylor
040baf5b82
Add a larger width on small inputs
...
Fixes #131 – I ended up deciding to do this for all inputs because the original `3rem` makes it cut off text past 1 char for any input that is only `3rem`, so `3.5rem` seemed like an okay width for this component.
2017-10-31 08:26:52 -04:00
DD
0d0cdfa757
Force a color state when switching to shape tools
2017-10-30 18:23:41 -04:00
DD
81191ff7f9
remove pen
2017-10-30 17:49:44 -04:00
Paul Kaplan
3becde590d
Merge pull request #159 from paulkaplan/aggregate-color-updates
...
Only submit SVG changes when color picker closes
2017-10-30 11:16:50 -04:00
Paul Kaplan
1f6f7b2405
Merge pull request #158 from paulkaplan/hide-box-on-mixed
...
Only show outline box if not mixed colors
2017-10-30 11:16:24 -04:00
Paul Kaplan
3dab6ef7f0
Fix nits
2017-10-30 11:13:29 -04:00
Paul Kaplan
a7c3566fe8
Merge pull request #163 from paulkaplan/fix-outline-box-position
...
Make outline box in color button centered
2017-10-30 11:09:07 -04:00
Paul Kaplan
8fdab88996
Merge pull request #160 from paulkaplan/fix-slider-ranges
...
Make color sliders go from 0 to 100
2017-10-30 11:09:00 -04:00
Paul Kaplan
c4da530240
Make outline box in color button centered
2017-10-30 09:52:49 -04:00
Paul Kaplan
02996af315
Merge pull request #157 from paulkaplan/fix-zoom-buttons
...
Swap zoom in and out buttons
2017-10-30 08:53:43 -04:00
Paul Kaplan
b78b99b3a9
Make color sliders go from 0 to 100
2017-10-29 14:51:25 -04:00
Paul Kaplan
7cc3ecf74b
Only submit SVG changes when color picker closes
2017-10-29 14:10:43 -04:00
Paul Kaplan
c43d510860
Swap zoom in and out buttons
2017-10-29 13:36:53 -04:00
DD
c41c31ac3e
fix comment
2017-10-27 13:35:28 -04:00
DD
85d7090ad0
Make sure chirality of subtracted path is correct. Sort pieces by area so that we check for holes in most nested pieces first. This breaks if paths cross themselves.
2017-10-27 13:30:22 -04:00
Paul Kaplan
7622d02184
Only show outline box if not mixed colors
2017-10-27 11:37:08 -04:00
DD
819215786f
fix erase with holes in it, but it still doesn't work if you erase crazy path with crazy path
2017-10-27 11:20:45 -04:00
DD Liu
2be90c1633
Merge pull request #117 from paulkaplan/also-ctrl-key
...
Allow ctrl key to zoom
2017-10-27 11:20:10 -04:00
Paul Kaplan
76b9efabeb
Allow ctrl key to zoom
2017-10-27 11:18:21 -04:00
Paul Kaplan
5bae62e7d1
Merge pull request #116 from paulkaplan/wheel-pan-zoom
...
Add basic zooming and panning
2017-10-27 11:12:21 -04:00
Paul Kaplan
172526b8ad
Remove "icon" from alt text
2017-10-27 10:59:26 -04:00
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
