diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/views/collections/collectionFreeForm/MarqueeView.tsx | 8 | ||||
| -rw-r--r-- | src/client/views/nodes/DocumentView.tsx | 8 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/client/views/collections/collectionFreeForm/MarqueeView.tsx b/src/client/views/collections/collectionFreeForm/MarqueeView.tsx index 143e7b917..cb655d4e8 100644 --- a/src/client/views/collections/collectionFreeForm/MarqueeView.tsx +++ b/src/client/views/collections/collectionFreeForm/MarqueeView.tsx @@ -70,7 +70,7 @@ export class MarqueeView extends React.Component<MarqueeViewProps> } @action onPointerDown = (e: React.PointerEvent): void => { - if (!e.metaKey && this.props.container.props.active()) { + if (!e.metaKey && (e.altKey || this.props.container.props.active())) { this._downX = this._lastX = e.pageX; this._downY = this._lastY = e.pageY; this._used = false; @@ -82,6 +82,8 @@ export class MarqueeView extends React.Component<MarqueeViewProps> if (e.button == 2 || e.altKey) e.stopPropagation(); } + if (e.altKey) + e.preventDefault(); } @action @@ -100,6 +102,8 @@ export class MarqueeView extends React.Component<MarqueeViewProps> e.preventDefault(); } } + if (e.altKey) + e.preventDefault(); } @action @@ -116,6 +120,8 @@ export class MarqueeView extends React.Component<MarqueeViewProps> } this.props.selectDocuments(mselect.length ? mselect : [this.props.container.props.Document]); } + if (e.altKey) + e.preventDefault(); } intersectRect(r1: { left: number, top: number, width: number, height: number }, diff --git a/src/client/views/nodes/DocumentView.tsx b/src/client/views/nodes/DocumentView.tsx index 3ada3252c..c62dbd59a 100644 --- a/src/client/views/nodes/DocumentView.tsx +++ b/src/client/views/nodes/DocumentView.tsx @@ -178,7 +178,7 @@ export class DocumentView extends React.Component<DocumentViewProps> { if (Math.abs(this._downX - e.clientX) > 3 || Math.abs(this._downY - e.clientY) > 3) { document.removeEventListener("pointermove", this.onPointerMove); document.removeEventListener("pointerup", this.onPointerUp); - if (!this.topMost || e.buttons === 2 || e.altKey) { + if (!e.altKey && (!this.topMost || e.buttons === 2)) { this.startDragging(this._downX, this._downY, e.ctrlKey || e.altKey); } } @@ -222,12 +222,8 @@ export class DocumentView extends React.Component<DocumentViewProps> { } @action - public minimize = (where: number[]): void => { + public minimize = (): void => { this.props.Document.SetBoolean(KeyStore.Minimized, true); - if (where[0] !== 0 || where[1] !== 0) - this.props.Document.SetNumber(KeyStore.MinimizedX, where[0]); - if (where[1] !== 0 || where[0] !== 0) - this.props.Document.SetNumber(KeyStore.MinimizedY, where[1]); } @undoBatch |