Browse Source

feat(virtual-background): Desktop share as virtual background wip

j8
tudordan7 4 years ago
parent
commit
72cd3d70e1
1 changed files with 7 additions and 1 deletions
  1. 7
    1
      react/features/toolbox/components/web/Toolbox.js

+ 7
- 1
react/features/toolbox/components/web/Toolbox.js View File

101
  */
101
  */
102
 type Props = {
102
 type Props = {
103
 
103
 
104
+    /**
105
+     * String showing if the virtual background type is desktop-share.
106
+     */
107
+    _backgroundType: String,
108
+
104
     /**
109
     /**
105
      * Whether or not the chat feature is currently displayed.
110
      * Whether or not the chat feature is currently displayed.
106
      */
111
      */
891
      * @returns {void}
896
      * @returns {void}
892
      */
897
      */
893
     _onToolbarToggleScreenshare() {
898
     _onToolbarToggleScreenshare() {
894
-        if (!this.props._desktopSharingEnabled) {
899
+        if (!this.props._desktopSharingEnabled || this.props._backgroundType === 'desktop-share') {
895
             return;
900
             return;
896
         }
901
         }
897
 
902
 
1371
         _clientWidth: clientWidth,
1376
         _clientWidth: clientWidth,
1372
         _conference: conference,
1377
         _conference: conference,
1373
         _desktopSharingEnabled: desktopSharingEnabled,
1378
         _desktopSharingEnabled: desktopSharingEnabled,
1379
+        _backgroundType: state['features/virtual-background'].backgroundType,
1374
         _desktopSharingDisabledTooltipKey: desktopSharingDisabledTooltipKey,
1380
         _desktopSharingDisabledTooltipKey: desktopSharingDisabledTooltipKey,
1375
         _dialog: Boolean(state['features/base/dialog'].component),
1381
         _dialog: Boolean(state['features/base/dialog'].component),
1376
         _feedbackConfigured: Boolean(callStatsID),
1382
         _feedbackConfigured: Boolean(callStatsID),

Loading…
Cancel
Save