Merge pull request #242 from thecodingmachine/screenshare2

Avoiding flickering when entering presentation mode with no presentation
This commit is contained in:
David Négrier 2020-08-24 18:30:20 +02:00 committed by GitHub
commit 15e7b88e2b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -208,8 +208,8 @@ class LayoutManager {
const mainSectionChildren = Array.from(document.querySelectorAll<HTMLDivElement>('div.main-section > div').values());
const sidebarChildren = Array.from(document.querySelectorAll<HTMLDivElement>('aside.sidebar > div').values());
// Nothing? Let's center
if (mainSectionChildren.length === 0 && sidebarChildren.length === 0) {
// No presentation? Let's center on the screen
if (mainSectionChildren.length === 0) {
return {
xStart: 0,
yStart: 0,
@ -218,18 +218,6 @@ class LayoutManager {
}
}
if (mainSectionChildren.length === 0) {
const lastSidebarDiv = sidebarChildren[sidebarChildren.length-1];
// No presentation? Let's center on the main-section space
return {
xStart: 0,
yStart: 0,
xEnd: lastSidebarDiv.offsetLeft,
yEnd: window.innerHeight
}
}
// At this point, we know we have at least one element in the main section.
const lastPresentationDiv = mainSectionChildren[mainSectionChildren.length-1];