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

Merge branch 'develop' of github.com:havfo/multiparty-meeting into feat/app-fullscreen 

* 'develop' of github.com:havfo/multiparty-meeting:
  Fix number of boxes being counted in updateDimensions
  fix: fullscreenbutton on screenshare
  rollback updateDimensions to counting video elements instead of peers(needed fixes screensharing)
master
Torjus 2018-07-19 10:19:27 +02:00
parent 9c2d7bbce2 ae8e906f27
commit fb6db175b8
3 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/lib/components/Peer.jsx
View File

@ -147,7 +147,11 @@ class Peer extends Component
{screenConsumer ? {screenConsumer ?
<div className={classnames('view-container', 'screen')} style={style}> <div className={classnames('view-container', 'screen')} style={style}>
<div className='controls'> <div
className={classnames('controls', {
visible : this.state.controlsVisible
})}
>
<div <div
className={classnames('button', 'screen', { className={classnames('button', 'screen', {
on : screenVisible, on : screenVisible,

28
app/lib/components/Peers.jsx
View File

@ -22,7 +22,12 @@ class Peers extends React.Component
updateDimensions = () => updateDimensions = () =>
{ {
const n = this.props.peers.length; const n = this.props.boxes;
if (n === 0)
{
return;
}
const width = this.refs.peers.clientWidth; const width = this.refs.peers.clientWidth;
const height = this.refs.peers.clientHeight; const height = this.refs.peers.clientHeight;
@ -116,27 +121,24 @@ class Peers extends React.Component
} }
Peers.propTypes = Peers.propTypes =
{ {
advancedMode : PropTypes.bool, advancedMode : PropTypes.bool,
peers : PropTypes.arrayOf(appPropTypes.Peer).isRequired, peers : PropTypes.arrayOf(appPropTypes.Peer).isRequired,
videoStreams : PropTypes.any, boxes : PropTypes.number,
activeSpeakerName : PropTypes.string, activeSpeakerName : PropTypes.string,
toolAreaOpen : PropTypes.bool toolAreaOpen : PropTypes.bool
}; };
const mapStateToProps = (state) => const mapStateToProps = (state) =>
{ {
const peersArray = Object.values(state.peers); const peers = Object.values(state.peers);
const videoStreamsArray = Object.values(state.consumers);
const videoStreams = const boxes = peers.length + Object.values(state.consumers)
videoStreamsArray.filter((consumer) => .filter((consumer) => consumer.source === 'screen').length;
{
return (consumer.source === 'webcam' || consumer.source === 'screen');
}).length;
return { return {
peers : peersArray, peers,
videoStreams : videoStreams, boxes,
activeSpeakerName : state.room.activeSpeakerName, activeSpeakerName : state.room.activeSpeakerName,
toolAreaOpen : state.toolarea.toolAreaOpen toolAreaOpen : state.toolarea.toolAreaOpen
}; };

1
app/stylus/components/FullView.styl
View File

@ -7,7 +7,6 @@
flex-direction: column; flex-direction: column;
overflow: hidden; overflow: hidden;
background-color: rgba(#2a4b58, 0.9); background-color: rgba(#2a4b58, 0.9);
background-image: url('/resources/images/buddy.svg');
background-position: bottom; background-position: bottom;
background-size: auto 85%; background-size: auto 85%;
background-repeat: no-repeat; background-repeat: no-repeat;