From 285bc89a400c2faa7b6c7c327300c7842711935b Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Mon, 22 Mar 2021 16:06:13 +0100 Subject: fix proportional sizing --- frontend/app/views/tile/handles/tile.image.js | 4 ++-- frontend/app/views/tile/handles/tile.link.js | 8 ++++---- frontend/app/views/tile/handles/tile.script.js | 4 ++-- frontend/app/views/tile/handles/tile.text.js | 8 ++++---- frontend/app/views/tile/handles/tile.video.js | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) (limited to 'frontend/app/views/tile/handles') diff --git a/frontend/app/views/tile/handles/tile.image.js b/frontend/app/views/tile/handles/tile.image.js index beeb36a..b6d1d78 100644 --- a/frontend/app/views/tile/handles/tile.image.js +++ b/frontend/app/views/tile/handles/tile.image.js @@ -1,10 +1,10 @@ import React from 'react' import { generateTransform } from 'app/views/tile/tile.utils' -export default function TileImage({ tile, box, videoBounds, viewing, onMouseDown, onDoubleClick }) { +export default function TileImage({ tile, box, bounds, videoBounds, viewing, onMouseDown, onDoubleClick }) { // console.log(tile) const style = { - transform: generateTransform(tile, box, videoBounds), + transform: generateTransform(tile, box, bounds, videoBounds), opacity: tile.settings.opacity, } // console.log(generateTransform(tile)) diff --git a/frontend/app/views/tile/handles/tile.link.js b/frontend/app/views/tile/handles/tile.link.js index a87b95f..fb6ec03 100644 --- a/frontend/app/views/tile/handles/tile.link.js +++ b/frontend/app/views/tile/handles/tile.link.js @@ -1,10 +1,10 @@ import React from 'react' import { generateTransform, unitsDimension } from 'app/views/tile/tile.utils' -export default function TileScript({ tile, box, videoBounds, viewing, onMouseDown, onDoubleClick }) { +export default function TileScript({ tile, box, bounds, videoBounds, viewing, onMouseDown, onDoubleClick }) { // console.log(tile) const style = { - transform: generateTransform(tile, box, videoBounds), + transform: generateTransform(tile, box, bounds, videoBounds), opacity: tile.settings.opacity, } // console.log(generateTransform(tile)) @@ -15,8 +15,8 @@ export default function TileScript({ tile, box, videoBounds, viewing, onMouseDow let content = "" className += ' ' + tile.settings.align - style.width = unitsDimension(tile, 'width', videoBounds) - style.height = unitsDimension(tile, 'height', videoBounds) + style.width = unitsDimension(tile, 'width', bounds, videoBounds) + style.height = unitsDimension(tile, 'height', bounds, videoBounds) return (
className += ' ' + tile.settings.align - style.width = unitsDimension(tile, 'width', videoBounds) - style.height = unitsDimension(tile, 'height', videoBounds) + style.width = unitsDimension(tile, 'width', bounds, videoBounds) + style.height = unitsDimension(tile, 'height', bounds, videoBounds) style.fontFamily = tile.settings.font_family style.fontSize = tile.settings.font_size + 'px' style.lineHeight = 1.5 diff --git a/frontend/app/views/tile/handles/tile.video.js b/frontend/app/views/tile/handles/tile.video.js index 271a671..a34d348 100644 --- a/frontend/app/views/tile/handles/tile.video.js +++ b/frontend/app/views/tile/handles/tile.video.js @@ -59,7 +59,7 @@ export default class TileVideo extends Component { let { tile, box, bounds, videoBounds, viewing, onMouseDown, onDoubleClick } = this.props // console.log(tile) const style = { - transform: generateTransform(tile, box, videoBounds), + transform: generateTransform(tile, box, bounds, videoBounds), opacity: tile.settings.opacity, } let className = ['tile', tile.type].join(' ') -- cgit v1.2.3-70-g09d2