diff options
author | bob <bcz@cs.brown.edu> | 2020-02-07 15:54:15 -0500 |
---|---|---|
committer | bob <bcz@cs.brown.edu> | 2020-02-07 15:54:15 -0500 |
commit | 7bfb03e1340e0b4b008d7d40f8b70b215bd56329 (patch) | |
tree | 7525145c7d90a8b68f483648fede2cf9f6508fec /src | |
parent | 7627df4e22f9d5f65d09cc0f8d0088d571ebb5e2 (diff) | |
parent | 8d61d534eae3cb0f95a4eb39bb3ac637b362f6d7 (diff) |
Merge branch 'fixinglayoutsyms'
Diffstat (limited to 'src')
-rw-r--r-- | src/client/views/collections/CollectionStackingView.tsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/views/collections/CollectionStackingView.tsx b/src/client/views/collections/CollectionStackingView.tsx index 9e8600193..171aecc70 100644 --- a/src/client/views/collections/CollectionStackingView.tsx +++ b/src/client/views/collections/CollectionStackingView.tsx @@ -378,7 +378,7 @@ export class CollectionStackingView extends CollectionSubView(doc => doc) { } @computed get contentScale() { const heightExtra = this.heightPercent > 1 ? this.heightPercent : 1; - return Math.max(this.props.Document[WidthSym]() / this.props.PanelWidth(), heightExtra * this.props.Document[HeightSym]() / this.props.PanelHeight()); + return Math.min(this.props.Document[WidthSym]() / this.props.PanelWidth(), heightExtra * this.props.Document[HeightSym]() / this.props.PanelHeight()); } @computed get widthScale() { return this.heightPercent < 1 ? Math.max(1, this.contentScale) : 1; |