Use an actual one-on-one layout in landscape on mobile

2026-07-28 11:53:26 +02:00
parent 0b21cff020
commit aa6732da19
2 changed files with 77 additions and 13 deletions
@@ -1257,17 +1257,23 @@ export function createCallViewModel$(
              ),
            );
          case "flat":
-            return gridMode$.pipe(
-              switchMap((gridMode) => {
-                switch (gridMode) {
-                  case "grid":
-                    // Yes, grid mode actually gets you a "spotlight" layout in
-                    // this window mode.
-                    return spotlightLandscapeLayoutMedia$(true);
-                  case "spotlight":
-                    return spotlightExpandedLayoutMedia$(true);
-                }
-              }),
+            return oneOnOneMobileLayoutMedia$.pipe(
+              switchMap((oneOnOne) =>
+                oneOnOne === null
+                  ? gridMode$.pipe(
+                      switchMap((gridMode) => {
+                        switch (gridMode) {
+                          case "grid":
+                            // Yes, grid mode actually gets you a "spotlight" layout in
+                            // this window mode.
+                            return spotlightLandscapeLayoutMedia$(true);
+                          case "spotlight":
+                            return spotlightExpandedLayoutMedia$(true);
+                        }
+                      }),
+                    )
+                  : of(oneOnOne),
+              ),
            );
          case "pip":
            return pipLayoutMedia$;