aboutsummaryrefslogtreecommitdiff
path: root/src/client/views/collections/CollectionStackingView.tsx
diff options
context:
space:
mode:
authorTyler Schicke <tyler_schicke@brown.edu>2019-06-04 11:55:12 -0400
committerTyler Schicke <tyler_schicke@brown.edu>2019-06-04 11:55:12 -0400
commit17a0657482a2704790b9d78ad0444fe5e6efdf1d (patch)
tree0beb0c0e355e787bf3d86c93c6d41dccae049b02 /src/client/views/collections/CollectionStackingView.tsx
parent19f0a2f1757991d4aa3a4c5329902afe15d0f050 (diff)
parentf2c4b71abc29d3416944eee539041ff324632417 (diff)
Merge branch 'master' of github-tsch-brown:browngraphicslab/Dash-Web
Diffstat (limited to 'src/client/views/collections/CollectionStackingView.tsx')
-rw-r--r--src/client/views/collections/CollectionStackingView.tsx8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/client/views/collections/CollectionStackingView.tsx b/src/client/views/collections/CollectionStackingView.tsx
index ea3c144f2..da7ea50c6 100644
--- a/src/client/views/collections/CollectionStackingView.tsx
+++ b/src/client/views/collections/CollectionStackingView.tsx
@@ -26,8 +26,8 @@ export class CollectionStackingView extends CollectionSubView(doc => doc) {
() => {
if (this.singleColumn) {
this.props.Document.height = this.childDocs.filter(d => !d.isMinimized).reduce((height, d) => {
- let hgt = d[HeightSym]() / NumCast(d.zoomBasis, 1);
- let wid = d[WidthSym]() / NumCast(d.zoomBasis, 1);
+ let hgt = d[HeightSym]();
+ let wid = d[WidthSym]();
let nw = NumCast(d.nativeWidth);
let nh = NumCast(d.nativeHeight);
if (nw && nh) hgt = nh / nw * Math.min(this.columnWidth, wid);
@@ -76,10 +76,10 @@ export class CollectionStackingView extends CollectionSubView(doc => doc) {
return this.childDocs.filter(d => !d.isMinimized).map((d, i) => {
let dref = React.createRef<HTMLDivElement>();
let script = undefined;
- let colWidth = () => d.nativeWidth ? Math.min(d[WidthSym]() / NumCast(d.zoomBasis, 1), this.columnWidth) : this.columnWidth;
+ let colWidth = () => d.nativeWidth ? Math.min(d[WidthSym](), this.columnWidth) : this.columnWidth;
let margin = colWidth() < this.columnWidth ? "auto" : undefined;
let rowHeight = () => {
- let hgt = d[HeightSym]() / NumCast(d.zoomBasis, 1);
+ let hgt = d[HeightSym]();
let nw = NumCast(d.nativeWidth);
let nh = NumCast(d.nativeHeight);
if (nw && nh) hgt = nh / nw * colWidth();