diff options
author | yunahi <60233430+yunahi@users.noreply.github.com> | 2021-01-09 01:24:23 +0900 |
---|---|---|
committer | yunahi <60233430+yunahi@users.noreply.github.com> | 2021-01-09 01:24:23 +0900 |
commit | b4dea3a9ee58805504c50f963537e57c024e43e3 (patch) | |
tree | 6a48d041ef15a78b38a2b7a7761639747cb2374d /src/client/views/DocumentDecorations.tsx | |
parent | 28dccafaa4aa446dd88c1b6f4218a0d7f79fa1bb (diff) | |
parent | 264292f75d17c19e65bc4707b10a713b64510cf1 (diff) |
Merge branch 'ink_edits' of https://github.com/browngraphicslab/Dash-Web into ink_edits
merge conflict
Diffstat (limited to 'src/client/views/DocumentDecorations.tsx')
-rw-r--r-- | src/client/views/DocumentDecorations.tsx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/client/views/DocumentDecorations.tsx b/src/client/views/DocumentDecorations.tsx index 63b99cd85..13eeaa3e7 100644 --- a/src/client/views/DocumentDecorations.tsx +++ b/src/client/views/DocumentDecorations.tsx @@ -293,10 +293,11 @@ export class DocumentDecorations extends React.Component<{}, { value: string }> const right = Math.max(...xs); const bottom = Math.max(...ys); - // doc._height = (bottom - top) * element.props.ScreenToLocalTransform().Scale; - // doc._width = (right - left) * element.props.ScreenToLocalTransform().Scale; - doc._height = (bottom - top); - doc._width = (right - left); + doc._height = (bottom - top) * element.props.ScreenToLocalTransform().Scale; + doc._width = (right - left) * element.props.ScreenToLocalTransform().Scale; + // doc._height = (bottom - top); + // doc._width = (right - left); + } index++; |