diff options
author | bobzel <zzzman@gmail.com> | 2020-12-14 02:01:57 -0500 |
---|---|---|
committer | bobzel <zzzman@gmail.com> | 2020-12-14 02:01:57 -0500 |
commit | 37d9d2cad93a08518cec6c95c8bc941dd5f5ddaa (patch) | |
tree | 25b4fee39aeb543333b87b2d03f7fb4645bad1c2 /src/client/views/nodes/ContentFittingDocumentView.tsx | |
parent | 257b259717486b984b90b75a8561b7b5c76a6964 (diff) |
more changes to ContentScaling to get web/video/image boxes to work with annotation/DocDecorations in contentfitting and freeform views.
Diffstat (limited to 'src/client/views/nodes/ContentFittingDocumentView.tsx')
-rw-r--r-- | src/client/views/nodes/ContentFittingDocumentView.tsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/views/nodes/ContentFittingDocumentView.tsx b/src/client/views/nodes/ContentFittingDocumentView.tsx index 396f3807f..5111fa041 100644 --- a/src/client/views/nodes/ContentFittingDocumentView.tsx +++ b/src/client/views/nodes/ContentFittingDocumentView.tsx @@ -4,7 +4,7 @@ import { observer } from "mobx-react"; import { Doc } from "../../../fields/Doc"; import { NumCast } from "../../../fields/Types"; import { TraceMobx } from "../../../fields/util"; -import { emptyFunction, OmitKeys, returnVal } from "../../../Utils"; +import { emptyFunction, OmitKeys, returnVal, returnTrue } from "../../../Utils"; import { DocumentView, DocumentViewProps } from "../nodes/DocumentView"; import { StyleProp } from "../StyleProvider"; import "./ContentFittingDocumentView.scss"; @@ -70,12 +70,12 @@ export class ContentFittingDocumentView extends React.Component<DocumentViewProp }}> <DocumentView {...OmitKeys(this.props, ["NativeWidth", "NativeHeight"]).omit} ref={action((r: DocumentView | null) => this.docView = r)} - LayoutTemplate={this.props.LayoutTemplate} PanelWidth={this.PanelWidth} PanelHeight={this.PanelHeight} NativeWidth={this.NativeWidth} NativeHeight={this.NativeHeight} ContentScaling={this.NativeScaling} + contentFittingXf={returnTrue} ScreenToLocalTransform={this.screenToLocalTransform} focus={this.props.focus || emptyFunction} bringToFront={emptyFunction} |