OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Another fix for indentation

pull/21833/head
Dariusz Niemczyk 2021-08-03 14:59:35 +02:00 committed by Dariusz Niemczyk
parent 466151a10c
commit 389d0b2d4a
No known key found for this signature in database
GPG Key ID: 28DFE7164F497CB6
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/views/voip/CallView.tsx
View File

@ -660,7 +660,7 @@ export default class CallView extends React.Component<IProps, IState> {
let onHoldBackground = null; let onHoldBackground = null;
const backgroundStyle: CSSProperties = {}; const backgroundStyle: CSSProperties = {};
const backgroundAvatarUrl = avatarUrlForMember( const backgroundAvatarUrl = avatarUrlForMember(
// is it worth getting the size of the div to pass here? // is it worth getting the size of the div to pass here?
this.props.call.getOpponentMember(), 1024, 1024, 'crop', this.props.call.getOpponentMember(), 1024, 1024, 'crop',
); );
backgroundStyle.backgroundImage = 'url(' + backgroundAvatarUrl + ')'; backgroundStyle.backgroundImage = 'url(' + backgroundAvatarUrl + ')';
@ -680,7 +680,7 @@ export default class CallView extends React.Component<IProps, IState> {
mx_CallView_voice_hold: isOnHold, mx_CallView_voice_hold: isOnHold,
}); });
contentView =( contentView = (
<div className={classes} onMouseMove={this.onMouseMove}> <div className={classes} onMouseMove={this.onMouseMove}>
<div className="mx_CallView_voice_avatarsContainer"> <div className="mx_CallView_voice_avatarsContainer">
<div <div

2
src/components/views/voip/CallView/CallViewHeader.tsx
View File

@ -55,7 +55,7 @@ const onExpandClick = (roomId: string) => {
}; };
type CallControlsProps = Pick<CallViewHeaderProps, 'pipMode' | 'type'> & { type CallControlsProps = Pick<CallViewHeaderProps, 'pipMode' | 'type'> & {
roomId: string; roomId: string;
}; };
function CallViewHeaderControls({ pipMode = false, type, roomId }: CallControlsProps): JSX.Element { function CallViewHeaderControls({ pipMode = false, type, roomId }: CallControlsProps): JSX.Element {
return <div className="mx_CallView_header_controls"> return <div className="mx_CallView_header_controls">

18
src/components/views/voip/PictureInPictureDragger.tsx
View File

@ -68,8 +68,8 @@ export class PictureInPictureDragger extends React.Component<IProps, IState> {
super(props); super(props);
this.state = { this.state = {
translationX: UIStore.instance.windowWidth - PADDING.right - PIP_VIEW_WIDTH, translationX: UIStore.instance.windowWidth - PADDING.right - PIP_VIEW_WIDTH,
translationY: UIStore.instance.windowHeight - PADDING.bottom - PIP_VIEW_WIDTH, translationY: UIStore.instance.windowHeight - PADDING.bottom - PIP_VIEW_WIDTH,
}; };
} }
@ -93,14 +93,14 @@ export class PictureInPictureDragger extends React.Component<IProps, IState> {
// infinite loop // infinite loop
if ( if (
!this.moving && !this.moving &&
Math.abs(this.state.translationX - this.desiredTranslationX) <= 1 && Math.abs(this.state.translationX - this.desiredTranslationX) <= 1 &&
Math.abs(this.state.translationY - this.desiredTranslationY) <= 1 Math.abs(this.state.translationY - this.desiredTranslationY) <= 1
) return; ) return;
const amt = this.moving ? MOVING_AMT : SNAPPING_AMT; const amt = this.moving ? MOVING_AMT : SNAPPING_AMT;
this.setState({ this.setState({
translationX: lerp(this.state.translationX, this.desiredTranslationX, amt), translationX: lerp(this.state.translationX, this.desiredTranslationX, amt),
translationY: lerp(this.state.translationY, this.desiredTranslationY, amt), translationY: lerp(this.state.translationY, this.desiredTranslationY, amt),
}); });
this.scheduledUpdate.mark(); this.scheduledUpdate.mark();
}; };
@ -136,11 +136,11 @@ export class PictureInPictureDragger extends React.Component<IProps, IState> {
// corner // corner
const windowWidth = ( const windowWidth = (
UIStore.instance.windowWidth - UIStore.instance.windowWidth -
(this.callViewWrapper.current?.clientWidth || PIP_VIEW_WIDTH) (this.callViewWrapper.current?.clientWidth || PIP_VIEW_WIDTH)
); );
const windowHeight = ( const windowHeight = (
UIStore.instance.windowHeight - UIStore.instance.windowHeight -
(this.callViewWrapper.current?.clientHeight || PIP_VIEW_HEIGHT) (this.callViewWrapper.current?.clientHeight || PIP_VIEW_HEIGHT)
); );
if (translationX >= windowWidth / 2 && translationY >= windowHeight / 2) { if (translationX >= windowWidth / 2 && translationY >= windowHeight / 2) {
@ -190,7 +190,7 @@ export class PictureInPictureDragger extends React.Component<IProps, IState> {
const translatePixelsX = this.state.translationX + "px"; const translatePixelsX = this.state.translationX + "px";
const translatePixelsY = this.state.translationY + "px"; const translatePixelsY = this.state.translationY + "px";
const style = { const style = {
transform: `translateX(${translatePixelsX}) transform: `translateX(${translatePixelsX})
translateY(${translatePixelsY})`, translateY(${translatePixelsY})`,
}; };
return ( return (