From 90f394be1bd4d2797770e43f9f99a919ca09823b Mon Sep 17 00:00:00 2001 From: bobzel Date: Tue, 13 Sep 2022 21:15:50 -0400 Subject: added x/y as playground fields so that pres box mini player can be dragged around. added height as a playground field for mini player. fixed not setting GuestTarget when opening up to a docking view. --- src/client/views/MainView.tsx | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx index a1e355c22..2aa7f392b 100644 --- a/src/client/views/MainView.tsx +++ b/src/client/views/MainView.tsx @@ -34,6 +34,7 @@ import { CollectionDockingView } from './collections/CollectionDockingView'; import { MarqueeOptionsMenu } from './collections/collectionFreeForm/MarqueeOptionsMenu'; import { CollectionLinearView } from './collections/collectionLinear'; import { CollectionMenu } from './collections/CollectionMenu'; +import { CollectionView } from './collections/CollectionView'; import './collections/TreeView.scss'; import { ComponentDecorations } from './ComponentDecorations'; import { ContextMenu } from './ContextMenu'; @@ -166,6 +167,8 @@ export class MainView extends React.Component { 'timelineHeightPercent', 'panX', 'panY', + 'x', + 'y', 'fitWidth', 'nativeWidth', 'nativeHeight', @@ -180,6 +183,7 @@ export class MainView extends React.Component { 'chromeHidden', 'currentFrame', 'width', + 'height', 'nativeWidth', ]); // can play with these fields on someone else's } @@ -231,7 +235,13 @@ export class MainView extends React.Component { if (pathname.length > 1 && pathname[0] === 'doc') { Doc.MainDocId = pathname[1]; //!this.userDoc && - DocServer.GetRefField(pathname[1]).then(action(field => field instanceof Doc && (Doc.GuestTarget = field))); + DocServer.GetRefField(pathname[1]).then( + action(field => { + if (field instanceof Doc && field._viewType !== CollectionViewType.Docking) { + Doc.GuestTarget = field; + } + }) + ); } } -- cgit v1.2.3-70-g09d2