scratchfoundation/scratch-paint
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-paint.git synced 2024-12-23 05:52:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

update fill preview on mouse-down

Browse source
This commit is contained in:
Christopher Willis-Ford 2021-03-19 14:18:26 -07:00
parent 244da0b27d
commit 3004a2a5cd
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/helper/tools/fill-tool.js
View file

@ -21,6 +21,7 @@ class FillTool extends paper.Tool {
// We have to set these functions instead of just declaring them because // We have to set these functions instead of just declaring them because
// paper.js tools hook up the listeners in the setter functions. // paper.js tools hook up the listeners in the setter functions.
this.onMouseDown = this.handleMouseDown;
this.onMouseMove = this.handleMouseMove; this.onMouseMove = this.handleMouseMove;
this.onMouseUp = this.handleMouseUp; this.onMouseUp = this.handleMouseUp;
@ -91,7 +92,7 @@ class FillTool extends paper.Tool {
setPrevHoveredItemId (prevHoveredItemId) { setPrevHoveredItemId (prevHoveredItemId) {
this.prevHoveredItemId = prevHoveredItemId; this.prevHoveredItemId = prevHoveredItemId;
} }
handleMouseMove (event) { updateFillPreview (event) {
const hoveredItem = getHoveredItem(event, this.getHitOptions(), true /* subselect */); const hoveredItem = getHoveredItem(event, this.getHitOptions(), true /* subselect */);
if ((!hoveredItem && this.prevHoveredItemId) || // There is no longer a hovered item if ((!hoveredItem && this.prevHoveredItemId) || // There is no longer a hovered item
(hoveredItem && !this.prevHoveredItemId) || // There is now a hovered item (hoveredItem && !this.prevHoveredItemId) || // There is now a hovered item
@ -152,9 +153,17 @@ class FillTool extends paper.Tool {
this._setFillItemColor(this.fillColor, this.fillColor2, this.gradientType, event.point); this._setFillItemColor(this.fillColor, this.fillColor2, this.gradientType, event.point);
} }
} }
handleMouseDown (event) {
// on touch, the user might touch-and-hold to preview what the fill tool would do
// if they don't move their finger at all after the "mouse down" event
// then this might be our only chance to give them a good preview
this.updateFillPreview(event);
}
handleMouseMove (event) {
this.updateFillPreview(event);
}
handleMouseUp (event) { handleMouseUp (event) {
if (event.event.button > 0) return; // only first mouse button if (event.event.button > 0) return; // only first mouse button
this.handleMouseMove(event); // if it's a touch event we need to simulate hover first; if not this is harmless
if (this.fillItem) { if (this.fillItem) {
// If the hole we're filling in is the same color as the parent, and parent has no outline, remove the hole // If the hole we're filling in is the same color as the parent, and parent has no outline, remove the hole
if (this.addedFillItem && if (this.addedFillItem &&