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

change captions position to not depend on presentation

Browse Source
This commit is contained in:
Ramon Souza 2022-04-13 15:10:40 -03:00
parent bc823b84e0
commit 0b26f066e0
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bigbluebutton-html5/imports/ui/components/layout/layout-manager/customLayout.jsx
View File

@ -739,6 +739,7 @@ class CustomLayout extends Component {
.calculatesSidebarNavBounds(sidebarNavWidth.width, sidebarContentWidth.width); .calculatesSidebarNavBounds(sidebarNavWidth.width, sidebarContentWidth.width);
const sidebarContentBounds = this const sidebarContentBounds = this
.calculatesSidebarContentBounds(sidebarNavWidth.width, sidebarContentWidth.width); .calculatesSidebarContentBounds(sidebarNavWidth.width, sidebarContentWidth.width);
const sidebarSize = sidebarContentWidth.width + sidebarNavWidth.width;
const mediaAreaBounds = this const mediaAreaBounds = this
.calculatesMediaAreaBounds(sidebarNavWidth.width, sidebarContentWidth.width); .calculatesMediaAreaBounds(sidebarNavWidth.width, sidebarContentWidth.width);
const navbarBounds = this.calculatesNavbarBounds(mediaAreaBounds); const navbarBounds = this.calculatesNavbarBounds(mediaAreaBounds);
@ -794,9 +795,9 @@ class CustomLayout extends Component {
layoutContextDispatch({ layoutContextDispatch({
type: ACTIONS.SET_CAPTIONS_OUTPUT, type: ACTIONS.SET_CAPTIONS_OUTPUT,
value: { value: {
left: !isRTL ? (mediaBounds.left + captionsMargin) : null, left: !isRTL ? (sidebarSize + captionsMargin) : null,
right: isRTL ? (mediaBounds.right + captionsMargin) : null, right: isRTL ? (sidebarSize + captionsMargin) : null,
maxWidth: mediaBounds.width - (captionsMargin * 2), maxWidth: mediaAreaBounds.width - (captionsMargin * 2),
}, },
}); });

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

@ -544,9 +544,9 @@ class PresentationFocusLayout extends Component {
layoutContextDispatch({ layoutContextDispatch({
type: ACTIONS.SET_CAPTIONS_OUTPUT, type: ACTIONS.SET_CAPTIONS_OUTPUT,
value: { value: {
left: !isRTL ? (mediaBounds.left + captionsMargin) : null, left: !isRTL ? (sidebarSize + captionsMargin) : null,
right: isRTL ? (mediaBounds.right + captionsMargin) : null, right: isRTL ? (sidebarSize + captionsMargin) : null,
maxWidth: mediaBounds.width - (captionsMargin * 2), maxWidth: mediaAreaBounds.width - (captionsMargin * 2),
}, },
}); });

6
bigbluebutton-html5/imports/ui/components/layout/layout-manager/smartLayout.jsx
View File

@ -590,9 +590,9 @@ class SmartLayout extends Component {
layoutContextDispatch({ layoutContextDispatch({
type: ACTIONS.SET_CAPTIONS_OUTPUT, type: ACTIONS.SET_CAPTIONS_OUTPUT,
value: { value: {
left: !isRTL ? (mediaBounds.left + captionsMargin) : null, left: !isRTL ? (sidebarSize + captionsMargin) : null,
right: isRTL ? (mediaBounds.right + captionsMargin) : null, right: isRTL ? (sidebarSize + captionsMargin) : null,
maxWidth: mediaBounds.width - (captionsMargin * 2), maxWidth: mediaAreaBounds.width - (captionsMargin * 2),
}, },
}); });

6
bigbluebutton-html5/imports/ui/components/layout/layout-manager/videoFocusLayout.jsx
View File

@ -556,9 +556,9 @@ class VideoFocusLayout extends Component {
layoutContextDispatch({ layoutContextDispatch({
type: ACTIONS.SET_CAPTIONS_OUTPUT, type: ACTIONS.SET_CAPTIONS_OUTPUT,
value: { value: {
left: !isRTL ? (mediaBounds.left + captionsMargin) : null, left: !isRTL ? (sidebarSize + captionsMargin) : null,
right: isRTL ? (mediaBounds.right + captionsMargin) : null, right: isRTL ? (sidebarSize + captionsMargin) : null,
maxWidth: mediaBounds.width - (captionsMargin * 2), maxWidth: mediaAreaBounds.width - (captionsMargin * 2),
}, },
}); });