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.

Sign up for GitHub

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

Jump to bottom

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

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

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2a4e7f
Fix player full screen causing the app to start in full screen
absidue May 20, 2024
cf9d7c7
Merge branch 'development' into full-screen-startup-fix
absidue May 21, 2024
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,6 +602,8 @@ function runApp() {
}
}

const htmlFullscreenWindowIds = new Set()

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

newWindow.on('enter-html-full-screen', () => {
htmlFullscreenWindowIds.add(newWindow.id)
absidue marked this conversation as resolved.
Show resolved Hide resolved
})

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