From 3d0a3a74e0a835331aae9f7e6d54e42ef2816042 Mon Sep 17 00:00:00 2001 From: Mitchell McCaffrey Date: Thu, 21 Apr 2022 09:33:43 +1000 Subject: [PATCH] Fix toggle fog being triggered with middle mouse drag --- src/components/tools/FogTool.tsx | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/components/tools/FogTool.tsx b/src/components/tools/FogTool.tsx index 94494e8..726c697 100644 --- a/src/components/tools/FogTool.tsx +++ b/src/components/tools/FogTool.tsx @@ -325,7 +325,7 @@ function FogTool({ setDrawingShape(null); } - eraseHoveredShapes(); + eraseHoveredShapes(props); setIsBrushDown(false); } @@ -566,7 +566,10 @@ function FogTool({ }); }, [toolSettings.useFogCut]); - function eraseHoveredShapes() { + function eraseHoveredShapes(event: any) { + if (!leftMouseButton(event)) { + return; + } // Erase if (hoveredShapes.length > 0) { if (toolSettings.type === "remove") { @@ -605,9 +608,14 @@ function FogTool({ handleShapeOver(shape, isBrushDown)} + onMouseMove={(e: Konva.KonvaEventObject) => + (!isBrushDown || leftMouseButton(e)) && + handleShapeOver(shape, isBrushDown) + } onTouchOver={() => handleShapeOver(shape, isBrushDown)} - onMouseDown={() => handleShapeOver(shape, true)} + onMouseDown={(e: Konva.KonvaEventObject) => + leftMouseButton(e) && handleShapeOver(shape, true) + } onTouchStart={() => handleShapeOver(shape, true)} onMouseUp={eraseHoveredShapes} onTouchEnd={eraseHoveredShapes}