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/VideoBox.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/VideoBox.tsx')
| -rw-r--r-- | src/client/views/nodes/VideoBox.tsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/views/nodes/VideoBox.tsx b/src/client/views/nodes/VideoBox.tsx index 06a305515..77db7189a 100644 --- a/src/client/views/nodes/VideoBox.tsx +++ b/src/client/views/nodes/VideoBox.tsx @@ -414,7 +414,7 @@ export class VideoBox extends ViewBoxAnnotatableComponent<FieldViewProps, VideoD return this.addDocument(doc); } - @computed get contentScaling() { return this.props.scaling?.() || 1; } + @computed get contentScaling() { return this.props.contentFittingXf?.() ? 1 : this.props.scaling?.() || 1; } scaling = () => this.contentScaling; screenToLocalTransform = () => this.props.ScreenToLocalTransform().scale(1 / this.scaling()); contentFunc = () => [this.youtubeVideoId ? this.youtubeContent : this.content]; @@ -434,7 +434,7 @@ export class VideoBox extends ViewBoxAnnotatableComponent<FieldViewProps, VideoD isAnnotationOverlay={true} select={emptyFunction} active={this.annotationsActive} - ContentScaling={this.scaling} + scaling={this.scaling} ScreenToLocalTransform={this.screenToLocalTransform} whenActiveChanged={this.whenActiveChanged} removeDocument={this.removeDocument} |
