Briq
/
multiparty-meeting
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't hide controls when there is no video. Fixes #99.

master
Håvar Aambø Fosstveit 2019-06-05 20:40:19 +02:00
parent 739e7c2d97
commit 21a1322415
1 changed files with 60 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/components/Containers/Peer.js
View File

@ -73,7 +73,7 @@ const styles = (theme) =>
justifyContent : 'center', justifyContent : 'center',
alignItems : 'flex-end', alignItems : 'flex-end',
padding : '0.4vmin', padding : '0.4vmin',
zIndex : 20, zIndex : 21,
opacity : 0, opacity : 0,
transition : 'opacity 0.3s', transition : 'opacity 0.3s',
touchAction : 'none', touchAction : 'none',
@ -92,7 +92,7 @@ const styles = (theme) =>
justifyContent : 'center', justifyContent : 'center',
alignItems : 'center', alignItems : 'center',
padding : '0.4vmin', padding : '0.4vmin',
zIndex : 21, zIndex : 20,
'& p' : '& p' :
{ {
padding : '6px 12px', padding : '6px 12px',
@ -209,7 +209,6 @@ const Peer = (props) =>
:null :null
} }
{ videoVisible ?
<div <div
className={classnames(classes.controls, webcamHover ? 'hover' : null)} className={classnames(classes.controls, webcamHover ? 'hover' : null)}
onMouseOver={() => setWebcamHover(true)} onMouseOver={() => setWebcamHover(true)}
@ -235,6 +234,7 @@ const Peer = (props) =>
<Fab <Fab
aria-label='Mute mic' aria-label='Mute mic'
className={classes.fab} className={classes.fab}
disabled={!micConsumer}
color={micEnabled ? 'default' : 'secondary'} color={micEnabled ? 'default' : 'secondary'}
onClick={() => onClick={() =>
{ {
@ -280,8 +280,6 @@ const Peer = (props) =>
<FullScreenIcon /> <FullScreenIcon />
</Fab> </Fab>
</div> </div>
:null
}
<VideoView <VideoView
advancedMode={advancedMode} advancedMode={advancedMode}