diff options
author | bob <bcz@cs.brown.edu> | 2019-06-17 14:41:57 -0400 |
---|---|---|
committer | bob <bcz@cs.brown.edu> | 2019-06-17 14:41:57 -0400 |
commit | a408a4d791fa19f19bd9fab791c2bea2c0d178ab (patch) | |
tree | 8b83423138dd980149d387505421811da01824d7 /src/client/views/nodes/DocumentView.tsx | |
parent | f74e512e500252ad76d77935e7aacbf72cb0dd9c (diff) | |
parent | 62e7e21d6db96a9c62710c2bc6842705b79f5665 (diff) |
Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web
Diffstat (limited to 'src/client/views/nodes/DocumentView.tsx')
-rw-r--r-- | src/client/views/nodes/DocumentView.tsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/views/nodes/DocumentView.tsx b/src/client/views/nodes/DocumentView.tsx index 8ece7d67f..9d0206e48 100644 --- a/src/client/views/nodes/DocumentView.tsx +++ b/src/client/views/nodes/DocumentView.tsx @@ -508,8 +508,8 @@ export class DocumentView extends DocComponent<DocumentViewProps, Document>(Docu render() { var scaling = this.props.ContentScaling(); - var nativeHeight = this.nativeHeight > 0 ? `${this.nativeHeight}px` : "100%"; var nativeWidth = this.nativeWidth > 0 ? `${this.nativeWidth}px` : "100%"; + var nativeHeight = BoolCast(this.props.Document.ignoreAspect) ? this.props.PanelHeight() / this.props.ContentScaling() : this.nativeHeight > 0 ? `${this.nativeHeight}px` : "100%"; return ( <div className={`documentView-node${this.props.isTopMost ? "-topmost" : ""}`} ref={this._mainCont} |