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

Deactivate filmstrip in settings for now.

master
Håvar Aambø Fosstveit 2019-04-02 10:36:34 +02:00
parent 66375ec8cf
commit 829052de87
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/components/MeetingViews/Democratic.js
View File

@ -10,7 +10,8 @@ import HiddenPeers from '../Containers/HiddenPeers';
import ResizeObserver from 'resize-observer-polyfill'; import ResizeObserver from 'resize-observer-polyfill';
const RATIO = 1.334; const RATIO = 1.334;
const PADDING = 60; const PADDING_V = 50;
const PADDING_H = 20;
const styles = () => const styles = () =>
({ ({
@ -24,8 +25,10 @@ const styles = () =>
justifyContent : 'center', justifyContent : 'center',
alignItems : 'center', alignItems : 'center',
alignContent : 'center', alignContent : 'center',
paddingTop : 30, paddingTop : 40,
paddingBottom : 30 paddingBottom : 10,
paddingLeft : 10,
paddingRight : 10
}, },
peerContainer : peerContainer :
{ {
@ -74,8 +77,8 @@ class Democratic extends React.PureComponent
return; return;
} }
const width = this.peersRef.current.clientWidth; const width = this.peersRef.current.clientWidth - PADDING_H;
const height = this.peersRef.current.clientHeight - PADDING; const height = this.peersRef.current.clientHeight - PADDING_V;
let x, y, space; let x, y, space;

10
app/src/components/Settings/Settings.js
View File

@ -51,20 +51,20 @@ const styles = (theme) =>
} }
}); });
const modes = [ { /* const modes = [ {
value : 'democratic', value : 'democratic',
label : 'Democratic view' label : 'Democratic view'
}, { }, {
value : 'filmstrip', value : 'filmstrip',
label : 'Filmstrip view' label : 'Filmstrip view'
} ]; } ]; */
const Settings = ({ const Settings = ({
roomClient, roomClient,
room, room,
me, me,
onToggleAdvancedMode, onToggleAdvancedMode,
handleChangeMode, // handleChangeMode,
handleCloseSettings, handleCloseSettings,
classes classes
}) => }) =>
@ -158,7 +158,7 @@ const Settings = ({
control={<Checkbox checked={room.advancedMode} onChange={onToggleAdvancedMode} value='advancedMode' />} control={<Checkbox checked={room.advancedMode} onChange={onToggleAdvancedMode} value='advancedMode' />}
label='Advanced mode' label='Advanced mode'
/> />
<form className={classes.setting} autoComplete='off'> { /* <form className={classes.setting} autoComplete='off'>
<FormControl className={classes.formControl}> <FormControl className={classes.formControl}>
<Select <Select
value={room.mode || ''} value={room.mode || ''}
@ -178,7 +178,7 @@ const Settings = ({
Select room layout Select room layout
</FormHelperText> </FormHelperText>
</FormControl> </FormControl>
</form> </form> */ }
<DialogActions> <DialogActions>
<Button onClick={() => handleCloseSettings({ settingsOpen: false })} color='primary'> <Button onClick={() => handleCloseSettings({ settingsOpen: false })} color='primary'>
Close Close