xmj/element-call
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix infinite loop when a tile can't be enlarged

Browse source
This commit is contained in:
Robin Townsend 2023-02-03 16:52:42 -05:00
commit 206730ffc0
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/video-grid/NewVideoGrid.tsx
View file

@ -308,6 +308,7 @@ const cycleTileSize = (tileId: string, g: Grid): Grid => {
const nextScanLocations = new Set<number>([from]); const nextScanLocations = new Set<number>([from]);
const scanColumnOffset = Math.floor((toWidth - 1) / 2); const scanColumnOffset = Math.floor((toWidth - 1) / 2);
const scanRowOffset = Math.floor((toHeight - 1) / 2); const scanRowOffset = Math.floor((toHeight - 1) / 2);
const rows = row(g.cells.length - 1, g) + 1
let to: number | null = null; let to: number | null = null;
const displaceable = (c: Cell | undefined, i: number): boolean => const displaceable = (c: Cell | undefined, i: number): boolean =>
@ -319,6 +320,7 @@ const cycleTileSize = (tileId: string, g: Grid): Grid => {
const start = scanLocation - scanColumnOffset - g.columns * scanRowOffset; const start = scanLocation - scanColumnOffset - g.columns * scanRowOffset;
const end = areaEnd(start, candidateWidth, candidateHeight, g); const end = areaEnd(start, candidateWidth, candidateHeight, g);
const startColumn = column(start, g); const startColumn = column(start, g);
const startRow = row(start, g)
const endColumn = column(end, g); const endColumn = column(end, g);
if ( if (
@ -334,8 +336,8 @@ const cycleTileSize = (tileId: string, g: Grid): Grid => {
if (startColumn > 0) nextScanLocations.add(scanLocation - 1); if (startColumn > 0) nextScanLocations.add(scanLocation - 1);
if (endColumn < g.columns - 1) nextScanLocations.add(scanLocation + 1); if (endColumn < g.columns - 1) nextScanLocations.add(scanLocation + 1);
nextScanLocations.add(scanLocation - g.columns); if (startRow > 0) nextScanLocations.add(scanLocation - g.columns);
nextScanLocations.add(scanLocation + g.columns); if (startRow <= rows) nextScanLocations.add(scanLocation + g.columns);
} }
// TODO: Don't give up on placing the tile yet // TODO: Don't give up on placing the tile yet