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

fix(rn,labels) don't add extra margin in tile view 

There is no need to skip the filmstrip, since it's not there.
This commit is contained in:
Saúl Ibarra Corretgé 2021-03-18 13:02:16 +01:00 committed by Saúl Ibarra Corretgé
parent b179542c39
commit 33fc3833f9
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
react/features/conference/components/native/Labels.js
View File

@ -10,6 +10,7 @@ import {
RecordingExpandedLabel RecordingExpandedLabel
} from '../../../recording'; } from '../../../recording';
import { TranscribingExpandedLabel } from '../../../transcribing'; import { TranscribingExpandedLabel } from '../../../transcribing';
import { shouldDisplayTileView } from '../../../video-layout';
import { VideoQualityExpandedLabel } from '../../../video-quality'; import { VideoQualityExpandedLabel } from '../../../video-quality';
import { shouldDisplayNotifications } from '../../functions'; import { shouldDisplayNotifications } from '../../functions';
import AbstractLabels, { import AbstractLabels, {
@ -30,6 +31,11 @@ type Props = AbstractLabelsProps & {
*/ */
_aspectRatio: Symbol, _aspectRatio: Symbol,
/**
* True if tile view is being diaplyed, false otherwise.
*/
_shouldDisplayTileView: boolean,
/** /**
* True if the labels should be visible, false otherwise. * True if the labels should be visible, false otherwise.
*/ */
@ -151,7 +157,7 @@ class Labels extends AbstractLabels<Props, State> {
* @inheritdoc * @inheritdoc
*/ */
render() { render() {
const { _aspectRatio, _filmstripVisible, _visible } = this.props; const { _aspectRatio, _filmstripVisible, _shouldDisplayTileView, _visible } = this.props;
if (!_visible) { if (!_visible) {
return null; return null;
@ -168,7 +174,7 @@ class Labels extends AbstractLabels<Props, State> {
pointerEvents = 'box-none' pointerEvents = 'box-none'
style = { [ style = { [
styles.indicatorContainer, styles.indicatorContainer,
wide && _filmstripVisible wide && _filmstripVisible && !_shouldDisplayTileView
&& styles.indicatorContainerWide && styles.indicatorContainerWide
] }> ] }>
<TouchableOpacity <TouchableOpacity
@ -220,7 +226,7 @@ class Labels extends AbstractLabels<Props, State> {
<View <View
style = { [ style = { [
styles.indicatorContainer, styles.indicatorContainer,
wide && _filmstripVisible wide && _filmstripVisible && !_shouldDisplayTileView
&& styles.indicatorContainerWide && styles.indicatorContainerWide
] }> ] }>
{ {
@ -358,6 +364,7 @@ function _mapStateToProps(state) {
return { return {
..._abstractMapStateToProps(state), ..._abstractMapStateToProps(state),
_aspectRatio: state['features/base/responsive-ui'].aspectRatio, _aspectRatio: state['features/base/responsive-ui'].aspectRatio,
_shouldDisplayTileView: shouldDisplayTileView(state),
_visible: !shouldDisplayNotifications(state) _visible: !shouldDisplayNotifications(state)
}; };
} }