aboutsummaryrefslogtreecommitdiff
path: root/src/client/views/InkingCanvas.tsx
diff options
context:
space:
mode:
authorbob <bcz@cs.brown.edu>2019-04-01 10:03:06 -0400
committerbob <bcz@cs.brown.edu>2019-04-01 10:03:06 -0400
commit5940a2dce5b45382521cd20b4770732dcbc3e732 (patch)
tree75c62648e85a9c6a7840ff2a527a9063d0b4526d /src/client/views/InkingCanvas.tsx
parent5b348089bdc33e1e3b8e78ce51925b40793cb2cd (diff)
fixed inking problem - blinking cursors don't play nicely with ink
Diffstat (limited to 'src/client/views/InkingCanvas.tsx')
-rw-r--r--src/client/views/InkingCanvas.tsx15
1 files changed, 4 insertions, 11 deletions
diff --git a/src/client/views/InkingCanvas.tsx b/src/client/views/InkingCanvas.tsx
index fc871e108..15dfb255a 100644
--- a/src/client/views/InkingCanvas.tsx
+++ b/src/client/views/InkingCanvas.tsx
@@ -19,19 +19,12 @@ interface InkCanvasProps {
@observer
export class InkingCanvas extends React.Component<InkCanvasProps> {
static InkOffset: number = 50000;
+ private _currentStrokeId: string = "";
public static IntersectStrokeRect(stroke: StrokeData, selRect: { left: number, top: number, width: number, height: number }): boolean {
- let inside = false;
- stroke.pathData.map(val => {
- if (selRect.left < val.x - InkingCanvas.InkOffset && selRect.left + selRect.width > val.x - InkingCanvas.InkOffset &&
+ return stroke.pathData.reduce((inside, val) => inside ||
+ (selRect.left < val.x - InkingCanvas.InkOffset && selRect.left + selRect.width > val.x - InkingCanvas.InkOffset &&
selRect.top < val.y - InkingCanvas.InkOffset && selRect.top + selRect.height > val.y - InkingCanvas.InkOffset)
- inside = true;
- });
- return inside
- }
- private _currentStrokeId: string = "";
-
- constructor(props: Readonly<InkCanvasProps>) {
- super(props);
+ , false);
}
@computed