diff options
| author | bobzel <zzzman@gmail.com> | 2021-06-30 16:11:17 -0400 |
|---|---|---|
| committer | bobzel <zzzman@gmail.com> | 2021-06-30 16:11:17 -0400 |
| commit | fce572c4753adac69378d3ccf509561f0a839781 (patch) | |
| tree | e4569ac8e4c461533a5283ce1b70fe2235bb9be6 /src/client/views/nodes/VideoBox.tsx | |
| parent | 5e3f3de83797fa7aa3c82a2823e0bafeca222550 (diff) | |
| parent | 2579a16d5fb79a80a603e1e3574ed2548b1a77db (diff) | |
Merge branch 'master' of https://github.com/brown-dash/Dash-Web
Diffstat (limited to 'src/client/views/nodes/VideoBox.tsx')
| -rw-r--r-- | src/client/views/nodes/VideoBox.tsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/views/nodes/VideoBox.tsx b/src/client/views/nodes/VideoBox.tsx index 263fd5a19..fc08a2302 100644 --- a/src/client/views/nodes/VideoBox.tsx +++ b/src/client/views/nodes/VideoBox.tsx @@ -543,7 +543,7 @@ export class VideoBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProp } marqueeDown = action((e: React.PointerEvent) => { - if (!e.altKey && e.button === 0 && this.layoutDoc._viewScale === 1 && this.isContentActive(true)) this._marqueeing = [e.clientX, e.clientY]; + if (!e.altKey && e.button === 0 && this.layoutDoc._viewScale === 1 && this.isContentActive(true) && ![InkTool.Highlighter, InkTool.Pen].includes(CurrentUserUtils.SelectedTool)) this._marqueeing = [e.clientX, e.clientY]; }); finishMarquee = action(() => { |