mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-24 02:05:45 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix merge conflicts

Browse source
This commit is contained in:
Dariusz Niemczyk 2021-08-06 13:28:53 +02:00
parent 35386078a4
commit e8762fbe5b
No known key found for this signature in database
GPG key ID: 28DFE7164F497CB6
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/components/views/voip/CallView/CallViewHeader.tsx
View file

@ -22,6 +22,7 @@ import RoomAvatar from '../../avatars/RoomAvatar';
import AccessibleButton from '../../elements/AccessibleButton'; import AccessibleButton from '../../elements/AccessibleButton';
import dis from '../../../../dispatcher/dispatcher'; import dis from '../../../../dispatcher/dispatcher';
import classNames from 'classnames'; import classNames from 'classnames';
import AccessibleTooltipButton from '../../elements/AccessibleTooltipButton';
const callTypeTranslationByType: Record<CallType, () => string> = { const callTypeTranslationByType: Record<CallType, () => string> = {
[CallType.Video]: () => _t("Video Call"), [CallType.Video]: () => _t("Video Call"),
@ -62,11 +63,11 @@ type CallControlsProps = Pick<CallViewHeaderProps, 'pipMode' | 'type'> & {
const CallViewHeaderControls: React.FC<CallControlsProps> = ({ pipMode = false, type, roomId }) => { const CallViewHeaderControls: React.FC<CallControlsProps> = ({ pipMode = false, type, roomId }) => {
return <div className="mx_CallView_header_controls"> return <div className="mx_CallView_header_controls">
{ (pipMode && type === CallType.Video) && { (pipMode && type === CallType.Video) &&
<div className="mx_CallView_header_button mx_CallView_header_button_fullscreen" <AccessibleTooltipButton className="mx_CallView_header_button mx_CallView_header_button_fullscreen"
onClick={onFullscreenClick} onClick={onFullscreenClick}
title={_t("Fill Screen")} title={_t("Fill Screen")}
/> } /> }
{ pipMode && <div className="mx_CallView_header_button mx_CallView_header_button_expand" { pipMode && <AccessibleTooltipButton className="mx_CallView_header_button mx_CallView_header_button_expand"
onClick={() => onExpandClick(roomId)} onClick={() => onExpandClick(roomId)}
title={_t("Return to call")} title={_t("Return to call")}
/> } /> }