From f50cf7bcf7b411b4eb8f803b2ef9c71d09d95b25 Mon Sep 17 00:00:00 2001 From: Sam Wilkins Date: Wed, 14 Aug 2019 16:44:58 -0400 Subject: restored inking --- src/client/views/InkingCanvas.scss | 3 +-- src/client/views/InkingCanvas.tsx | 8 ++++++-- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/client/views/InkingCanvas.scss b/src/client/views/InkingCanvas.scss index d95398f17..5437b26d6 100644 --- a/src/client/views/InkingCanvas.scss +++ b/src/client/views/InkingCanvas.scss @@ -21,8 +21,7 @@ width: 8192px; height: 8192px; cursor: "crosshair"; - pointer-events: auto; - + pointer-events: all; } .inkingCanvas-canSelect, diff --git a/src/client/views/InkingCanvas.tsx b/src/client/views/InkingCanvas.tsx index b08133d80..cdb0a7c48 100644 --- a/src/client/views/InkingCanvas.tsx +++ b/src/client/views/InkingCanvas.tsx @@ -68,6 +68,7 @@ export class InkingCanvas extends React.Component { @action onPointerDown = (e: React.PointerEvent): void => { if (e.button !== 0 || e.altKey || e.ctrlKey || InkingControl.Instance.selectedTool === InkTool.None) { + console.log("RETURNING!"); return; } @@ -78,6 +79,8 @@ export class InkingCanvas extends React.Component { this.previousState = new Map(this.inkData); + console.log("POINTER DOWN"); + if (InkingControl.Instance.selectedTool !== InkTool.Eraser) { // start the new line, saves a uuid to represent the field of the stroke this._currentStrokeId = Utils.GenerateGuid(); @@ -167,15 +170,16 @@ export class InkingCanvas extends React.Component { }, [] as JSX.Element[]); let markerPaths = paths.filter(path => path.props.tool === InkTool.Highlighter); let penPaths = paths.filter(path => path.props.tool !== InkTool.Highlighter); + console.log(paths); return [!penPaths.length ? (null) : - {} + {penPaths} , !markerPaths.length ? (null) : - {} + {markerPaths} ]; } -- cgit v1.2.3-70-g09d2