diff options
author | Bob Zeleznik <zzzman@gmail.com> | 2019-04-22 23:39:35 -0400 |
---|---|---|
committer | Bob Zeleznik <zzzman@gmail.com> | 2019-04-22 23:39:35 -0400 |
commit | 6c5491b9c72650ae020a686753af3df74dfd87fb (patch) | |
tree | 4a1af6658af54f47d7d96fc005f52153167b35bc /src | |
parent | 64ffb725360b3a5f96aa45948e21e8836ede1479 (diff) |
another bad merge reveral?
Diffstat (limited to 'src')
-rw-r--r-- | src/client/views/collections/collectionFreeForm/MarqueeView.tsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/views/collections/collectionFreeForm/MarqueeView.tsx b/src/client/views/collections/collectionFreeForm/MarqueeView.tsx index c551a67fe..3adcb11bd 100644 --- a/src/client/views/collections/collectionFreeForm/MarqueeView.tsx +++ b/src/client/views/collections/collectionFreeForm/MarqueeView.tsx @@ -95,7 +95,7 @@ export class MarqueeView extends React.Component<MarqueeViewProps> this._showOnUp = false; PreviewCursor.Visible = false; } - if (!this._used && (e.buttons === 2 || e.altKey) && !e.metaKey && + if (!this._used && e.buttons === 1 && !e.metaKey && (Math.abs(this._lastX - this._downX) > MarqueeView.DRAG_THRESHOLD || Math.abs(this._lastY - this._downY) > MarqueeView.DRAG_THRESHOLD)) { this._visible = true; e.stopPropagation(); @@ -113,7 +113,7 @@ export class MarqueeView extends React.Component<MarqueeViewProps> if (this._showOnUp) { PreviewCursor.Show(this.hideCursor, this._downX, this._downY); document.addEventListener("keypress", this.onKeyPress, false); - } else if (e.button === 2 || e.altKey) { + } else if (e.button === 0) { let mselect = this.marqueeSelect(); if (!e.shiftKey) { SelectionManager.DeselectAll(mselect.length ? undefined : this.props.container.props.Document); |