mirror of
https://github.com/electron/electron.git
synced 2026-05-02 03:00:22 -04:00
fix: simpleFullScreen exits when web content calls requestFullscreen (#50874)
fix: simpleFullScreen exits when web content calls requestFullscreen SetHtmlApiFullscreen only checked IsFullscreen() to detect that the window was already fullscreen, missing the simple-fullscreen case on macOS. When web content triggered requestFullscreen the code fell through to SetFullScreen(true) which toggled simple fullscreen off. Include IsSimpleFullScreen() in the guard so the HTML-API fullscreen state is updated without touching the window's fullscreen mode.
This commit is contained in:
@@ -4509,7 +4509,8 @@ void WebContents::OnDevToolsSearchCompleted(
|
||||
|
||||
void WebContents::SetHtmlApiFullscreen(bool enter_fullscreen) {
|
||||
// Window is already in fullscreen mode, save the state.
|
||||
if (enter_fullscreen && owner_window()->IsFullscreen()) {
|
||||
if (enter_fullscreen && (owner_window()->IsFullscreen() ||
|
||||
owner_window()->IsSimpleFullScreen())) {
|
||||
native_fullscreen_ = true;
|
||||
UpdateHtmlApiFullscreen(true);
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user