Commit graph

121 commits

Author SHA1 Message Date
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
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
a5a60b0884 Offset the pasted item from the original when on the same costume 2017-11-01 18:10:03 -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
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
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
a35253c5e8
Merge pull request #168 from fsih/removePen
Remove pen
2017-10-31 10:24:29 -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
81191ff7f9 remove pen 2017-10-30 17:49:44 -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
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
b78b99b3a9 Make color sliders go from 0 to 100 2017-10-29 14:51:25 -04:00
Paul Kaplan
c43d510860 Swap zoom in and out buttons 2017-10-29 13:36:53 -04:00
Paul Kaplan
7622d02184 Only show outline box if not mixed colors 2017-10-27 11:37:08 -04:00
Paul Kaplan
172526b8ad Remove "icon" from alt text 2017-10-27 10:59:26 -04:00
Paul Kaplan
82928a51b9 Merge branch 'develop' into wheel-pan-zoom 2017-10-27 10:27:20 -04:00
Paul Kaplan
62526889c9 Remove wheel listeners from brush and eraser 2017-10-27 10:22:52 -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
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
b8aadc3c54 Disable fill or outline indicators for brush, line and pen 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
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
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
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
c1862284ff Remove unused reference 2017-10-25 15:23:30 -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