diff options
| author | vkalev <vjk1883@gmail.com> | 2021-07-15 22:13:41 -0500 |
|---|---|---|
| committer | vkalev <vjk1883@gmail.com> | 2021-07-15 22:13:41 -0500 |
| commit | 0f1e83c036c5ece55179c50251a239daae219771 (patch) | |
| tree | 96c2b17e8de0ba06eb47163a30daff02fab92fc6 /src/client/views/nodes/VideoBox.tsx | |
| parent | 48620bbe25f92eb179d53846aae5f0164ca6f1c2 (diff) | |
| parent | 31a00f5e5d374b8a2945525a75f80f4148c143b7 (diff) | |
Merge branch 'master' of https://github.com/brown-dash/Dash-Web into ink-gfx-victor
Merging master changes into ink branch
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(() => { |