fix: consider surface rotation when reporting surface overflows grid #…

…3219
bitfocus · Jan 17, 2025 · 7de0ca5 · 7de0ca5
1 parent d91f612
commit 7de0ca5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/companion/lib/Surface/Controller.ts b/companion/lib/Surface/Controller.ts
@@ -692,6 +692,7 @@ export class SurfaceController extends EventEmitter<SurfaceControllerEvents> {
 				hasFirmwareUpdates: null,
 
 				size: config.gridSize || null,
+				rotation: config.config.rotation,
 				offset: { columns: config?.config?.xOffset ?? 0, rows: config?.config?.yOffset ?? 0 },
 			}
 

diff --git a/shared-lib/lib/Model/Surfaces.ts b/shared-lib/lib/Model/Surfaces.ts
@@ -33,6 +33,7 @@ export interface ClientSurfaceItem {
 	hasFirmwareUpdates: SurfaceFirmwareUpdateInfo | null
 
 	size: RowsAndColumns | null
+	rotation: SurfaceRotation | null
 	offset: RowsAndColumns | null
 }
 

diff --git a/webui/src/Stores/SurfacesStore.tsx b/webui/src/Stores/SurfacesStore.tsx
@@ -98,10 +98,18 @@ export class SurfacesStore {
 			for (const surface of group.surfaces) {
 				if (!surface.size || !surface.offset) continue
 
+				// Determine the size, after rotation
+				let { rows, columns } = surface.size
+				if (surface.rotation === 'surface-90' || surface.rotation === 'surface90') {
+					const tmp = rows
+					rows = columns
+					columns = tmp
+				}
+
 				const minX = surface.offset.columns
 				const minY = surface.offset.rows
-				const maxX = minX + surface.size.columns - 1
-				const maxY = minY + surface.size.rows - 1
+				const maxX = minX + columns - 1
+				const maxY = minY + rows - 1
 
 				if (minX < bounds.minColumn || minY < bounds.minRow || maxX > bounds.maxColumn || maxY > bounds.maxRow) {
 					overflowingSurfaces.push(surface)