fix: handle failing to enter fullscreen on macOS (#43153)

* fix: handle failing to enter/exit fullscreen on macOS

On macOS, failing to enter/exit fullscreen can fail. If this happens,
properly restore the original window state.

Co-authored-by: cptpcrd <31829097+cptpcrd@users.noreply.github.com>

* refactor: remove fail to exit fullscreen handlers

Seem to be unnecessary since the window exits fullscreen anyway.

Co-authored-by: cptpcrd <31829097+cptpcrd@users.noreply.github.com>

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: cptpcrd <31829097+cptpcrd@users.noreply.github.com>
This commit is contained in:
trop[bot]
2024-08-01 14:57:20 +02:00
committed by GitHub
parent 33f9c92300
commit 4e2c6b5eb8
3 changed files with 20 additions and 0 deletions

View File

@@ -168,6 +168,7 @@ class NativeWindowMac : public NativeWindow,
void DetachChildren() override;
void NotifyWindowWillEnterFullScreen();
void NotifyWindowDidFailToEnterFullScreen();
void NotifyWindowWillLeaveFullScreen();
// Cleanup observers when window is getting closed. Note that the destructor

View File

@@ -1783,6 +1783,13 @@ void NativeWindowMac::NotifyWindowWillEnterFullScreen() {
UpdateVibrancyRadii(true);
}
void NativeWindowMac::NotifyWindowDidFailToEnterFullScreen() {
UpdateVibrancyRadii(false);
if (buttons_proxy_)
[buttons_proxy_ redraw];
}
void NativeWindowMac::NotifyWindowWillLeaveFullScreen() {
if (buttons_proxy_) {
// Hide window title when leaving fullscreen.

View File

@@ -311,6 +311,18 @@ using FullScreenTransitionState =
shell_->HandlePendingFullscreenTransitions();
}
- (void)windowDidFailToEnterFullScreen:(NSWindow*)window {
shell_->set_fullscreen_transition_state(FullScreenTransitionState::kNone);
shell_->SetResizable(is_resizable_);
shell_->NotifyWindowDidFailToEnterFullScreen();
if (shell_->HandleDeferredClose())
return;
shell_->HandlePendingFullscreenTransitions();
}
- (void)windowWillExitFullScreen:(NSNotification*)notification {
shell_->set_fullscreen_transition_state(FullScreenTransitionState::kExiting);