Skip to content

osx: Fix calling [window center] before setting gl_context #530

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
not-fl3 merged 1 commit into from
Feb 12, 2025
Merged

osx: Fix calling [window center] before setting gl_context #530

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
10 changes: 5 additions & 5 deletions src/native/macos.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1079,8 +1079,6 @@ where
let title = str_to_nsstring(&conf.window_title);
//let () = msg_send![window, setReleasedWhenClosed: NO];
let () = msg_send![window, setTitle: title];
let () = msg_send![window, center];
let () = msg_send![window, setAcceptsMouseMovedEvents: YES];

let view = match conf.platform.apple_gfx_api {
AppleGfxApi::OpenGl => create_opengl_view(&mut display, conf.sample_count, conf.high_dpi),
Expand All @@ -1095,8 +1093,6 @@ where
display.window = window;
display.view = view;

let () = msg_send![window, setContentView: view];

// cannot place it to create_opengl_view, because it should be called after setContentView
if conf.platform.apple_gfx_api == AppleGfxApi::OpenGl {
msg_send_![display.gl_context, setView:view];
Expand All @@ -1109,11 +1105,15 @@ where
});
}

let () = msg_send![window, setContentView: view];
let () = msg_send![window, makeFirstResponder: view];

let _ = display.update_dimensions();

assert!(!view.is_null());

let () = msg_send![window, makeFirstResponder: view];
let () = msg_send![window, center];
let () = msg_send![window, setAcceptsMouseMovedEvents: YES];

if conf.fullscreen {
let () = msg_send![window, toggleFullScreen: nil];
Expand Down
Loading