Browse Source

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

There is no need to skip the filmstrip, since it's not there.
master
Saúl Ibarra Corretgé 4 years ago
parent
commit
33fc3833f9
1 changed files with 10 additions and 3 deletions
  1. 10
    3
      react/features/conference/components/native/Labels.js

+ 10
- 3
react/features/conference/components/native/Labels.js View File

10
     RecordingExpandedLabel
10
     RecordingExpandedLabel
11
 } from '../../../recording';
11
 } from '../../../recording';
12
 import { TranscribingExpandedLabel } from '../../../transcribing';
12
 import { TranscribingExpandedLabel } from '../../../transcribing';
13
+import { shouldDisplayTileView } from '../../../video-layout';
13
 import { VideoQualityExpandedLabel } from '../../../video-quality';
14
 import { VideoQualityExpandedLabel } from '../../../video-quality';
14
 import { shouldDisplayNotifications } from '../../functions';
15
 import { shouldDisplayNotifications } from '../../functions';
15
 import AbstractLabels, {
16
 import AbstractLabels, {
30
      */
31
      */
31
     _aspectRatio: Symbol,
32
     _aspectRatio: Symbol,
32
 
33
 
34
+    /**
35
+     * True if tile view is being diaplyed, false otherwise.
36
+     */
37
+    _shouldDisplayTileView: boolean,
38
+
33
     /**
39
     /**
34
      * True if the labels should be visible, false otherwise.
40
      * True if the labels should be visible, false otherwise.
35
      */
41
      */
151
      * @inheritdoc
157
      * @inheritdoc
152
      */
158
      */
153
     render() {
159
     render() {
154
-        const { _aspectRatio, _filmstripVisible, _visible } = this.props;
160
+        const { _aspectRatio, _filmstripVisible, _shouldDisplayTileView, _visible } = this.props;
155
 
161
 
156
         if (!_visible) {
162
         if (!_visible) {
157
             return null;
163
             return null;
168
                     pointerEvents = 'box-none'
174
                     pointerEvents = 'box-none'
169
                     style = { [
175
                     style = { [
170
                         styles.indicatorContainer,
176
                         styles.indicatorContainer,
171
-                        wide && _filmstripVisible
177
+                        wide && _filmstripVisible && !_shouldDisplayTileView
172
                             && styles.indicatorContainerWide
178
                             && styles.indicatorContainerWide
173
                     ] }>
179
                     ] }>
174
                     <TouchableOpacity
180
                     <TouchableOpacity
220
                 <View
226
                 <View
221
                     style = { [
227
                     style = { [
222
                         styles.indicatorContainer,
228
                         styles.indicatorContainer,
223
-                        wide && _filmstripVisible
229
+                        wide && _filmstripVisible && !_shouldDisplayTileView
224
                             && styles.indicatorContainerWide
230
                             && styles.indicatorContainerWide
225
                     ] }>
231
                     ] }>
226
                     {
232
                     {
358
     return {
364
     return {
359
         ..._abstractMapStateToProps(state),
365
         ..._abstractMapStateToProps(state),
360
         _aspectRatio: state['features/base/responsive-ui'].aspectRatio,
366
         _aspectRatio: state['features/base/responsive-ui'].aspectRatio,
367
+        _shouldDisplayTileView: shouldDisplayTileView(state),
361
         _visible: !shouldDisplayNotifications(state)
368
         _visible: !shouldDisplayNotifications(state)
362
     };
369
     };
363
 }
370
 }

Loading…
Cancel
Save