BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14169 from ramonlsouza/issue-14153

Browse Source 
Add a different background color for contents that are being displayed under the side panel
This commit is contained in:
Anton Georgiev 2022-01-21 09:01:50 -05:00 committed by GitHub
commit c986dc41f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bigbluebutton-html5/imports/ui/components/layout/layout-manager/presentationFocusLayout.jsx
View File

@ -3,7 +3,12 @@ import { throttle, defaultsDeep } from 'lodash';
import { LayoutContextFunc } from '/imports/ui/components/layout/context';
import DEFAULT_VALUES from '/imports/ui/components/layout/defaultValues';
import { INITIAL_INPUT_STATE } from '/imports/ui/components/layout/initState';
import { DEVICE_TYPE, ACTIONS, PANELS } from '/imports/ui/components/layout/enums';
import {
DEVICE_TYPE,
ACTIONS,
PANELS,
CAMERADOCK_POSITION,
} from '/imports/ui/components/layout/enums';
const windowWidth = () => window.document.documentElement.clientWidth;
const windowHeight = () => window.document.documentElement.clientHeight;
@ -616,6 +621,7 @@ class PresentationFocusLayout extends Component {
type: ACTIONS.SET_CAMERA_DOCK_OUTPUT,
value: {
display: input.cameraDock.numCameras > 0,
position: CAMERADOCK_POSITION.SIDEBAR_CONTENT_BOTTOM,
minWidth: cameraDockBounds.minWidth,
width: cameraDockBounds.width,
maxWidth: cameraDockBounds.maxWidth,

3
bigbluebutton-html5/imports/ui/components/presentation/component.jsx
View File

@ -864,6 +864,9 @@ class Presentation extends PureComponent {
width: presentationBounds.width,
height: presentationBounds.height,
zIndex: fullscreenContext ? presentationBounds.zIndex : undefined,
background: layoutType === LAYOUT_TYPE.VIDEO_FOCUS && numCameras > 0 && !fullscreenContext
? 'var(--color-content-background)'
: null,
}}
>
{isFullscreen && <PollingContainer />}

1
bigbluebutton-html5/imports/ui/components/webcam/component.jsx
View File

@ -256,6 +256,7 @@ const WebcamComponent = ({
width: isDragging ? cameraSize.width : cameraDock.width,
height: isDragging ? cameraSize.height : cameraDock.height,
opacity: isDragging ? 0.5 : undefined,
background: isCameraSidebar ? 'var(--color-content-background)' : null,
}}
>
<VideoProviderContainer