Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Use the room avatar as a placeholder in calls #10231

Merged
merged 8 commits into from
Feb 27, 2023
Merged

Use the room avatar as a placeholder in calls #10231

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2927db5
Use the room avatar as a placeholder in calls
dbkr Feb 23, 2023
f38d55e
Prettier
dbkr Feb 23, 2023
22b401a
TS strict errors
dbkr Feb 24, 2023
301a30b
More TS strict fixes
dbkr Feb 24, 2023
fbf417a
More strict TS
dbkr Feb 24, 2023
79a41e5
Prettier
dbkr Feb 24, 2023
1d9bdf2
Even more TS strict
dbkr Feb 24, 2023
7519397
more stricter
dbkr Feb 24, 2023
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
Prev Previous commit
Next Next commit
Even more TS strict
  • Loading branch information
@dbkr
dbkr committed Feb 24, 2023
commit 1d9bdf2662a087ab3594a31d9309bebe37fc5d70
16 changes: 14 additions & 2 deletions src/components/views/voip/LegacyCallView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,14 +543,26 @@ export default class LegacyCallView extends React.Component<IProps, IState> {
} else if (secondaryFeed) {
return (
<div className="mx_LegacyCallView_content" onMouseMove={this.onMouseMove}>
<VideoFeed feed={primaryFeed} call={call} pipMode={pipMode} onResize={onResize} primary={true} />
<VideoFeed
feed={primaryFeed as CallFeed}
call={call}
pipMode={pipMode}
onResize={onResize}
primary={true}
/>
{secondaryFeedElement}
</div>
);
} else {
return (
<div className="mx_LegacyCallView_content" onMouseMove={this.onMouseMove}>
<VideoFeed feed={primaryFeed} call={call} pipMode={pipMode} onResize={onResize} primary={true} />
<VideoFeed
feed={primaryFeed as CallFeed}
call={call}
pipMode={pipMode}
onResize={onResize}
primary={true}
/>
{sidebarShown && <LegacyCallViewSidebar feeds={sidebarFeeds} call={call} pipMode={pipMode} />}
</div>
);
Expand Down