From e882783aeb3e425c339a15d80e602674261d2823 Mon Sep 17 00:00:00 2001 From: bob Date: Thu, 31 Jan 2019 11:51:01 -0500 Subject: just one more bug to fix with docking... --- src/views/nodes/DocumentView.tsx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/views/nodes') diff --git a/src/views/nodes/DocumentView.tsx b/src/views/nodes/DocumentView.tsx index 657cd62c9..7e2635438 100644 --- a/src/views/nodes/DocumentView.tsx +++ b/src/views/nodes/DocumentView.tsx @@ -16,12 +16,13 @@ import { FieldTextBox } from "../nodes/FieldTextBox"; import "./NodeView.scss"; import React = require("react"); import { cpus } from "os"; +import { relative } from "path"; const JsxParser = require('react-jsx-parser').default;//TODO Why does this need to be imported like this? interface DocumentViewProps { Document: Document; ContainingCollectionView: Opt; - ContainingDocumentView: Opt + ContainingDocumentView: Opt; } export interface CollectionViewProps { @@ -75,10 +76,7 @@ class DocumentContents extends React.Component { showWarnings={true} onError={(test: any) => { console.log(test) }} /> - - } - } @observer @@ -232,7 +230,7 @@ export class DocumentView extends React.Component { this._downX = e.clientX; this._downY = e.clientY; var me = this; - if (e.shiftKey) { + if (e.shiftKey && e.buttons === 1) { CollectionDockingView.StartOtherDrag(this._mainCont.current!, this.props.Document); e.stopPropagation(); return; @@ -320,6 +318,7 @@ export class DocumentView extends React.Component { transform: freestyling ? this.transform : "", width: freestyling ? this.width : "100%", height: freestyling ? this.height : "100%", + position: freestyling ? "absolute" : "relative", }} onContextMenu={this.onContextMenu} onPointerDown={this.onPointerDown}> -- cgit v1.2.3-70-g09d2