Skip to content

macOS: Fix overridden fullscreen selectors #2546

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

Merged
madsmtm merged 1 commit into from
Nov 3, 2022
Merged

macOS: Fix overridden fullscreen selectors #2546

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions src/platform_impl/macos/window_delegate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,9 +221,9 @@ declare_class!(
}

/// Invoked when before enter fullscreen
#[sel(windowWillEnterFullscreen:)]
#[sel(windowWillEnterFullScreen:)]
fn window_will_enter_fullscreen(&self, _: Option<&Object>) {
trace_scope!("windowWillEnterFullscreen:");
trace_scope!("windowWillEnterFullScreen:");

let mut shared_state = self
.window
Expand Down Expand Up @@ -287,9 +287,9 @@ declare_class!(
}

/// Invoked when entered fullscreen
#[sel(windowDidEnterFullscreen:)]
#[sel(windowDidEnterFullScreen:)]
fn window_did_enter_fullscreen(&mut self, _: Option<&Object>) {
trace_scope!("windowDidEnterFullscreen:");
trace_scope!("windowDidEnterFullScreen:");
*self.initial_fullscreen = false;
let mut shared_state = self.window.lock_shared_state("window_did_enter_fullscreen");
shared_state.in_fullscreen_transition = false;
Expand All @@ -301,9 +301,9 @@ declare_class!(
}

/// Invoked when exited fullscreen
#[sel(windowDidExitFullscreen:)]
#[sel(windowDidExitFullScreen:)]
fn window_did_exit_fullscreen(&self, _: Option<&Object>) {
trace_scope!("windowDidExitFullscreen:");
trace_scope!("windowDidExitFullScreen:");

self.window.restore_state_from_fullscreen();
let mut shared_state = self.window.lock_shared_state("window_did_exit_fullscreen");
Expand Down Expand Up @@ -331,9 +331,9 @@ declare_class!(
/// due to being in the midst of handling some other animation or user gesture.
/// This method indicates that there was an error, and you should clean up any
/// work you may have done to prepare to enter full-screen mode.
#[sel(windowDidFailToEnterFullscreen:)]
#[sel(windowDidFailToEnterFullScreen:)]
fn window_did_fail_to_enter_fullscreen(&self, _: Option<&Object>) {
trace_scope!("windowDidFailToEnterFullscreen:");
trace_scope!("windowDidFailToEnterFullScreen:");
let mut shared_state = self
.window
.lock_shared_state("window_did_fail_to_enter_fullscreen");
Expand Down