This commit is contained in:
Josh Hawkins 2024-05-10 10:17:41 -05:00
parent ec0bf391bf
commit 2a3e0fd5be

View File

@ -155,15 +155,15 @@ export default function DraggableGridLayout({
if (aspectRatio < 1) { if (aspectRatio < 1) {
// Portrait // Portrait
height = 4 * columnsPerPlayer; height = 2 * columnsPerPlayer;
width = columnsPerPlayer; width = columnsPerPlayer;
} else if (aspectRatio > 2) { } else if (aspectRatio > 2) {
// Wide // Wide
height = 2 * columnsPerPlayer; height = 1 * columnsPerPlayer;
width = 2 * columnsPerPlayer; width = 2 * columnsPerPlayer;
} else { } else {
// Landscape // Landscape
height = 2 * columnsPerPlayer; height = 1 * columnsPerPlayer;
width = columnsPerPlayer; width = columnsPerPlayer;
} }
@ -291,7 +291,7 @@ export default function DraggableGridLayout({
}, [error, clearError]); }, [error, clearError]);
const cellHeight = useMemo(() => { const cellHeight = useMemo(() => {
const aspectRatio = 32 / 9; const aspectRatio = 16 / 9;
// subtract container margin, 1 camera takes up at least 4 rows // subtract container margin, 1 camera takes up at least 4 rows
// account for additional margin on bottom of each row // account for additional margin on bottom of each row
return ( return (
@ -299,7 +299,7 @@ export default function DraggableGridLayout({
12 / 12 /
aspectRatio - aspectRatio -
marginValue + marginValue +
marginValue / 8 marginValue / 4
); );
}, [containerWidth, marginValue]); }, [containerWidth, marginValue]);
@ -363,10 +363,10 @@ export default function DraggableGridLayout({
cols={{ lg: 12, md: 12, sm: 12, xs: 12, xxs: 12 }} cols={{ lg: 12, md: 12, sm: 12, xs: 12, xxs: 12 }}
margin={[marginValue, marginValue]} margin={[marginValue, marginValue]}
containerPadding={[0, isEditMode ? 6 : 3]} containerPadding={[0, isEditMode ? 6 : 3]}
preventCollision={true} // preventCollision={true}
resizeHandles={isEditMode ? ["sw", "nw", "se", "ne"] : []} resizeHandles={isEditMode ? ["sw", "nw", "se", "ne"] : []}
onDragStop={handleLayoutChange} onDragStop={handleLayoutChange}
onResize={handleResize} // onResize={handleResize}
onResizeStop={handleLayoutChange} onResizeStop={handleLayoutChange}
> >
{includeBirdseye && birdseyeConfig?.enabled && ( {includeBirdseye && birdseyeConfig?.enabled && (