Commit graph

214 commits

Author SHA1 Message Date
DD
c9165b0b4c Revert "Don't enable if there is nothing in the editor"
This reverts commit e4ca0482b8.
2018-01-26 17:21:47 -05:00
DD
e4ca0482b8 Don't enable if there is nothing in the editor 2018-01-25 18:32:43 -05:00
DD
3ab1067c65 flip all 2018-01-25 11:33:43 -05:00
Paul Kaplan
243b8ccbb6 Add touch support for sliders include click-to-change on slider BG 2018-01-19 09:32:59 -05:00
DD
1f76e7de4c fix lint 2018-01-10 15:10:39 -05:00
DD
d0ca6e7174 Set a width on stroke width, brush and eraser width inputs 2018-01-10 15:05:40 -05:00
Matthew Taylor
90defd1634 set enterExitDuration to imperceptibly small value
#226 appears to be caused when the duration in ms is below a certain value, which is why we don’t see it in other popovers. I’m not sure exactly what may be causing this in the `react-popover` library and will open an issue about it, but for now, 20ms is imperceptibly fast, and removes the error.
2017-12-29 09:20:29 -05:00
DD Liu
a4780d2207
Merge pull request #243 from fsih/flip
Flip
2017-12-27 14:58:49 -05:00
DD
ffca22618d add input group 2017-12-27 14:31:18 -05:00
Matthew Taylor
7ee2c7e6b7
Merge pull request #240 from mewtaylor/issue/gui-830
Finish GUI-830: Add "coming soon" for bitmap, text tool
2017-12-26 12:04:02 -05:00
DD
04560d32ef Flip 2017-12-22 17:44:14 -05:00
Matthew Taylor
bb7e66d26b add an explicit width on the costume input
this fixes an issue with windows and the width of the top menu row
2017-12-22 17:02:48 -05:00
Matthew Taylor
900897c767 Edit copy/paste icons 2017-12-22 10:40:08 -05:00
Matthew Taylor
42399fe815 Add optional class to fill/stroke groups
And add a margin between them on the fill tool
2017-12-22 10:23:30 -05:00
Matthew Taylor
41297d3029 small css edits from @carljbowman 2017-12-22 09:59:33 -05:00
DD
396e73e640 internationalize messages 2017-12-21 17:18:17 -05:00
DD
07b30aa55b Handle pointed and curved 2017-12-21 15:38:24 -05:00
DD
0fc9fd151d Set enabled state based on whether any points are selected 2017-12-21 15:38:24 -05:00
DD
18db05fdce Show curved and pointed icons 2017-12-21 15:38:24 -05:00
Matthew Taylor
53034baa30 disable lint for empty function for now 2017-12-21 11:42:07 -05:00
Matthew Taylor
7cbe687c18 Add coming soon for bitmap, text tool 2017-12-21 11:24:38 -05:00
DD
f5c2fe2dd6 Break out mode tools 2017-12-20 14:34:32 -05:00
DD
bda56d0a41 Add the right icon 2017-12-19 13:47:39 -05:00
DD
207341f47f Basic fill tool 2017-12-19 13:47:39 -05:00
Matthew Taylor
7df3d69fc6 small styling updates
make the swatches aligned in gui, and make sure the cursor shows when not eye dropping. Also moves eye dropper initialization into the helper. Thanks @paulkaplan!
2017-12-15 10:37:31 -05:00
Matthew Taylor
73dce6ca50 add comment to colorInfo shape 2017-12-15 10:10:55 -05:00
Matthew Taylor
8c2fc475f6 updates from @paulkaplan’s feedback
1. Removes the cursour over loupe, and fills the loupe center’s color correctly
2. Fixes a console error and loupe initialization issue
3. Increases the size of the swatches

Thanks @paulkaplan!
2017-12-15 10:09:19 -05:00
Matthew Taylor
5caf6b7157 remove unused reference 2017-12-14 12:57:41 -05:00
Matthew Taylor
b49810a56d remove empty box css file 2017-12-14 08:54:02 -05:00
Matthew Taylor
ae0358079e use pixelRatio instead of scale constant
Turns out that the width/height paper sets on the canvas is tracked at scale to the width/height we set in the `pixelRatio` value, so use that to handle grabbing pixel color rather than a constant we set.
2017-12-13 13:13:43 -05:00
Matthew Taylor
4accabbc69 Changes from PR feedback
fixes lint and gui compatibility issues shown by @paulkaplan, and also does some cleanup to references and structure as requested by @fsih. Thanks to both of you for the reviews!

FYI – part of the canvas reference change made it so that the `PaintEditor` presentation component could become a classless declaration.
2017-12-11 13:24:57 -05:00
Matthew Taylor
2183dc759f Implement eye dropper for paint editor 2017-12-08 16:52:37 -05:00
Matthew Taylor
5ffdd14ff0
Merge pull request #194 from mewtaylor/issue/gh-41
Implement GH-41: Add minimum width gui
2017-11-21 11:06:05 -05:00
Matthew Taylor
27c0684e1c fine-tune the responsive design
squish some things together a bit more, including in desktop mode (in order to fit the coming “rotation point” button). Also turn canvas into 480x360, as it is in the mocks
2017-11-13 15:13:20 -05:00
Matthew Taylor
b48da92b9d squish buttons together a bit more on tablet 2017-11-13 07:45:22 -05:00
Matthew Taylor
351b3bb6e7 Add font family to menu items
popovers need explicit font family set
2017-11-09 16:03:57 -05:00
Matthew Taylor
6930da0644 fix linting
thanks @fsih!
2017-11-08 15:30:32 -05:00
Matthew Taylor
58355ea4c7 Add back in missing props
Whoops! Thanks @fsih
2017-11-08 15:05:30 -05:00
Matthew Taylor
e384c07e3d fix linting, tests 2017-11-08 10:13:17 -05:00
Matthew Taylor
018f9b28a6 add min width layout for tablet 2017-11-07 14:08:26 -05:00
Matthew Taylor
250e3ea089 fix validation 2017-11-07 14:04:54 -05:00
Matthew Taylor
95099d6e90 move modes to lib 2017-11-07 14:02:39 -05:00
Matthew Taylor
c347460034 remove small from live inputs
Fixes #131 by instead of changing the small width, simply just removing the small tag from things that don’t need it.
2017-11-07 09:37:12 -05:00
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
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
251967fefb fix merge 2017-10-24 13:27:09 -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
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