aboutsummaryrefslogtreecommitdiff
path: root/src/client/views/collections/CollectionDockingView.tsx
diff options
context:
space:
mode:
authorbob <bcz@cs.brown.edu>2019-02-22 15:25:00 -0500
committerbob <bcz@cs.brown.edu>2019-02-22 15:25:00 -0500
commitb53c5bfd421a56be1d8b0ea79209cdae01991ca1 (patch)
tree3a2994e6c74657f168e9d9d8cf76ab98c45024c1 /src/client/views/collections/CollectionDockingView.tsx
parentd2a34dca0cac114190f8f0eb36769b2b8fd9f329 (diff)
parentbc9096366d10654d16ed84251e7f4b7fb3a46727 (diff)
Merge branch 'collectionView'
Diffstat (limited to 'src/client/views/collections/CollectionDockingView.tsx')
-rw-r--r--src/client/views/collections/CollectionDockingView.tsx6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/client/views/collections/CollectionDockingView.tsx b/src/client/views/collections/CollectionDockingView.tsx
index 752007439..7ac8ea5e4 100644
--- a/src/client/views/collections/CollectionDockingView.tsx
+++ b/src/client/views/collections/CollectionDockingView.tsx
@@ -14,8 +14,9 @@ import { DragManager } from "../../util/DragManager";
import { undoBatch } from "../../util/UndoManager";
import { DocumentView } from "../nodes/DocumentView";
import "./CollectionDockingView.scss";
-import { CollectionViewProps, COLLECTION_BORDER_WIDTH, SubCollectionViewProps } from "./CollectionView";
+import { COLLECTION_BORDER_WIDTH } from "./CollectionView";
import React = require("react");
+import { SubCollectionViewProps } from "./CollectionViewBase";
@observer
export class CollectionDockingView extends React.Component<SubCollectionViewProps> {
@@ -289,7 +290,8 @@ export class DockedFrameRenderer extends React.Component<DockedFrameProps> {
AddDocument={undefined}
RemoveDocument={undefined}
Scaling={this._parentScaling}
- PanelSize={[this._nativeWidth, this._nativeHeight]}
+ PanelWidth={this._nativeWidth}
+ PanelHeight={this._nativeHeight}
ScreenToLocalTransform={this.ScreenToLocalTransform}
isTopMost={true}
ContainingCollectionView={undefined} />