diff options
| author | mehekj <mehek.jethani@gmail.com> | 2021-07-19 16:21:33 -0400 |
|---|---|---|
| committer | mehekj <mehek.jethani@gmail.com> | 2021-07-19 16:21:33 -0400 |
| commit | 618062ac7c2349dbc25cc69d8683d6e29ed947e8 (patch) | |
| tree | 37079834f2becda983d6fe3053ec80207873a94f /src/client/views/nodes/VideoBox.tsx | |
| parent | dced40cd975732c2c98f230a6c750af54ffdabd4 (diff) | |
| parent | 212d49772c1c2aa3d0a9382ef144dc3037faa8c2 (diff) | |
Merge branch 'master' into temporalmedia-mehek
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(() => { |