haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8354 from jitsi/tavram/fix-filmstrip 

fix(filmstrip) fix button not considering interface config settings
This commit is contained in:
Avram Tudor 2021-01-07 15:20:22 +02:00 committed by GitHub
parent dc5a776123 35a586df3c
commit 3881da5db9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
react/features/filmstrip/components/web/Filmstrip.js
View File

@ -13,6 +13,7 @@ import { translate } from '../../../base/i18n';
import { Icon, IconMenuDown, IconMenuUp } from '../../../base/icons'; import { Icon, IconMenuDown, IconMenuUp } from '../../../base/icons';
import { connect } from '../../../base/redux'; import { connect } from '../../../base/redux';
import { dockToolbox } from '../../../toolbox/actions.web'; import { dockToolbox } from '../../../toolbox/actions.web';
import { isButtonEnabled } from '../../../toolbox/functions.web';
import { getCurrentLayout, LAYOUTS } from '../../../video-layout'; import { getCurrentLayout, LAYOUTS } from '../../../video-layout';
import { setFilmstripHovered, setFilmstripVisible } from '../../actions'; import { setFilmstripHovered, setFilmstripVisible } from '../../actions';
import { shouldRemoteVideosBeVisible } from '../../functions'; import { shouldRemoteVideosBeVisible } from '../../functions';
@ -197,7 +198,7 @@ class Filmstrip extends Component <Props> {
let toolbar = null; let toolbar = null;
if (!this.props._hideToolbar) { if (!this.props._hideToolbar && isButtonEnabled('filmstrip')) {
toolbar = this._renderToggleButton(); toolbar = this._renderToggleButton();
} }