Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New spotlight layout #2382

Merged
merged 9 commits into from
Jul 18, 2024
Merged

New spotlight layout #2382

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
34c45cb
Get the right grid offset even when offsetParent is a layout element
robintown May 21, 2024
ffbbc74
Implement the new spotlight layout
robintown May 17, 2024
54c22f4
Clean up spotlight tile code
robintown May 28, 2024
ec1b020
Add indicators to spotlight tile and make spotlight layout responsive
robintown May 30, 2024
7f40ce8
Fix advance buttons showing up for the spotlight speaker
robintown May 31, 2024
dfda753
Only switch to spotlight for remote screen shares
robintown Jun 4, 2024
12b719d
Make layout reactivity a little more fine-grained
robintown Jun 4, 2024
1efa594
Use Array.some where it's appropriate
robintown Jul 17, 2024
7fcd712
Merge branch 'new-call-layouts' into spotlight-layout
robintown Jul 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/state/CallViewModel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,9 +376,9 @@ export class CallViewModel extends ViewModel {
shareReplay(1),
);

private readonly hasScreenShares: Observable<boolean> =
private readonly hasRemoteScreenShares: Observable<boolean> =
this.screenShares.pipe(
map((ms) => ms.length > 0),
map((ms) => ms.find((m) => !m.vm.local) !== undefined),
robintown marked this conversation as resolved.
Show resolved Hide resolved
distinctUntilChanged(),
);

Expand Down Expand Up @@ -474,7 +474,7 @@ export class CallViewModel extends ViewModel {
this.gridModeUserSelection,
// If the user hasn't selected spotlight and somebody starts screen sharing,
// automatically switch to spotlight mode and reset when screen sharing ends
this.hasScreenShares.pipe(
this.hasRemoteScreenShares.pipe(
withLatestFrom(this.gridModeUserSelection.pipe(startWith(null))),
concatMap(([hasScreenShares, userSelection]) =>
userSelection === "spotlight"
Expand Down