Missing Icon, and added tooltip to icons.

master
Håvar Aambø Fosstveit 2019-11-04 23:36:03 +01:00
parent 5604ba20bb
commit c7e40598f7
1 changed files with 40 additions and 31 deletions

View File

@ -34,8 +34,11 @@ import FullScreenExitIcon from '@material-ui/icons/FullscreenExit';
import SettingsIcon from '@material-ui/icons/Settings'; import SettingsIcon from '@material-ui/icons/Settings';
import SecurityIcon from '@material-ui/icons/Security'; import SecurityIcon from '@material-ui/icons/Security';
import LockDialog from './AccessControl/LockDialog/LockDialog'; import LockDialog from './AccessControl/LockDialog/LockDialog';
import LockIcon from '@material-ui/icons/Lock';
import LockOpenIcon from '@material-ui/icons/LockOpen';
import Button from '@material-ui/core/Button'; import Button from '@material-ui/core/Button';
import Settings from './Settings/Settings'; import Settings from './Settings/Settings';
import Tooltip from '@material-ui/core/Tooltip';
const TIMEOUT = 10 * 1000; const TIMEOUT = 10 * 1000;
@ -366,6 +369,7 @@ class Room extends React.PureComponent
</Tooltip> </Tooltip>
} }
{ this.fullscreen.fullscreenEnabled && { this.fullscreen.fullscreenEnabled &&
<Tooltip title={`${this.state.fullscreen ? 'Leave' : 'Enter'} fullscreen`}>
<IconButton <IconButton
aria-label='Fullscreen' aria-label='Fullscreen'
className={classes.actionButton} className={classes.actionButton}
@ -378,7 +382,9 @@ class Room extends React.PureComponent
<FullScreenIcon /> <FullScreenIcon />
} }
</IconButton> </IconButton>
</Tooltip>
} }
<Tooltip title='Show settings'>
<IconButton <IconButton
aria-label='Settings' aria-label='Settings'
className={classes.actionButton} className={classes.actionButton}
@ -387,7 +393,9 @@ class Room extends React.PureComponent
> >
<SettingsIcon /> <SettingsIcon />
</IconButton> </IconButton>
</Tooltip>
{ loginEnabled && { loginEnabled &&
<Tooltip title={`Log ${loggedIn ? 'out' : 'in'}`}>
<IconButton <IconButton
aria-label='Account' aria-label='Account'
className={classes.actionButton} className={classes.actionButton}
@ -403,6 +411,7 @@ class Room extends React.PureComponent
<AccountCircle /> <AccountCircle />
} }
</IconButton> </IconButton>
</Tooltip>
} }
<Button <Button
aria-label='Leave meeting' aria-label='Leave meeting'