Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix player full screen causing the app to start in full screen #5138

Open
wants to merge 2 commits into
base: development
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion src/main/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -596,6 +596,8 @@ function runApp() {
}
}

const htmlFullscreenWindowIds = new Set()

async function createWindow(
{
replaceMainWindow = true,
Expand Down Expand Up @@ -768,15 +770,28 @@ function runApp() {
}
})

newWindow.on('enter-html-full-screen', () => {
htmlFullscreenWindowIds.add(newWindow.id)
})

newWindow.on('leave-html-full-screen', () => {
htmlFullscreenWindowIds.delete(newWindow.id)
})

newWindow.once('close', async () => {
// returns true if the element existed in the set
const htmlFullscreen = htmlFullscreenWindowIds.delete(newWindow.id)

if (BrowserWindow.getAllWindows().length !== 1) {
return
}

const value = {
...newWindow.getNormalBounds(),
maximized: newWindow.isMaximized(),
fullScreen: newWindow.isFullScreen()

// Don't save the full screen state if it was triggered by an HTML API e.g. the video player
fullScreen: newWindow.isFullScreen() && !htmlFullscreen
}

await baseHandlers.settings._updateBounds(value)
Expand Down
Loading