8000 ios: support iOS 27 UIScene lifecycle (TN3187) by benface · Pull Request #634 · not-fl3/miniquad · GitHub
[go: up one dir, main page]
Skip to content
7FFF

ios: support iOS 27 UIScene lifecycle (TN3187) #634

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 2 commits into from
Jun 15, 2026
Merged

ios: support iOS 27 UIScene lifecycle (TN3187) #634

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb89b22
ios: support iOS 27 UIScene lifecycle (TN3187)
benface Jun 13, 2026
2e32433
ios: clean up scene-attach plumbing
benface Jun 13, 2026
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
85 changes: 76 additions & 9 deletions src/native/ios.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,16 @@
},
};

// iOS 27 / TN3187: windows must be created via `initWithWindowScene:`
// or they stay invisible. Window creation defers to the
// `UISceneWillConnectNotification` observer below; both that and
// `did_finish_launching_with_options` run on the main thread, so
// `thread_local` storage is sound.
thread_local! {
static PENDING_SCENE_VIEW_AND_CTRL: RefCell<Option<(ObjcId, ObjcId)>> =
RefCell::new(None);
}

struct MainThreadState {
quit: bool,
paused: bool,
Expand Down Expand Up @@ -493,13 +503,13 @@
let mut decl = ClassDecl::new("NSAppDelegate", superclass).unwrap();

extern "C" fn did_finish_launching_with_options(
_: &Object,
delegate_self: &Object,
_: Sel,
_: ObjcId,
_: ObjcId,
) -> BOOL {
unsafe {
let (f, conf) = RUN_ARGS.take().unwrap();

Check warning on line 512 in src/native/ios.rs

View workflow job for this annotation

GitHub Actions / Build (macos-latest, x86_64-apple-ios) 

creating a mutable reference to mutable static

Check warning on line 512 in src/native/ios.rs

View workflow job for this annotation

GitHub Actions / Build (macos-latest, aarch64-apple-ios) 

creating a mutable reference to mutable static

let main_screen: ObjcId = msg_send![class!(UIScreen), mainScreen];
let screen_rect: NSRect = msg_send![main_screen, bounds];
Expand All @@ -518,9 +528,8 @@
)
};

let window_obj: ObjcId = msg_send![class!(UIWindow), alloc];
let window_obj: ObjcId = msg_send![window_obj, initWithFrame: screen_rect];

// Window creation defers to `scene_will_connect`; view +
// view_ctrl built now so the render thread has them ready.
let view = match conf.platform.apple_gfx_api {
AppleGfxApi::OpenGl => {
create_opengl_view(screen_rect, conf.sample_count, conf.high_dpi)
Expand Down Expand Up @@ -603,11 +612,34 @@
(*view.view_dlg).set_ivar("display_ptr", payload_ptr);
(*textfield_dlg).set_ivar("display_ptr", payload_ptr);

msg_send_![window_obj, addSubview: view.view];

msg_send_![window_obj, setRootViewController: view.view_ctrl];

msg_send_![window_obj, makeKeyAndVisible];
// Stash view + view_ctrl for `scene_will_connect` to adopt
// into a freshly-created `initWithWindowScene:` window.
PENDING_SCENE_VIEW_AND_CTRL
.with(|cell| *cell.borrow_mut() = Some((view.view, view.view_ctrl)));

let notification_center: ObjcId =
msg_send![class!(NSNotificationCenter), defaultCenter];
let scene_will_connect_name =
apple_util::str_to_nsstring("UISceneWillConnectNotification");
let _: () = msg_send![notification_center,
addObserver: delegate_self
selector: sel!(sceneWillConnect:)
name: scene_will_connect_name
object: nil];

// iOS 27 fires `applicationWillResignActive:` during the
// scene-attach handoff (legacy lifecycle compat path), which
// sends `Message::Pause` and blocks the render thread. There's
// no follow-up `applicationDidBecomeActive:` because the scene
// lifecycle drives the real activation. Re-Resume on every
// scene activation to recover.
let scene_did_activate_name =
apple_util::str_to_nsstring("UISceneDidActivateNotification");
let _: () = msg_send![notification_center,
addObserver: delegate_self
selector: sel!(sceneDidActivate:)
name: scene_did_activate_name
object: nil];

struct SendHack<F>(F);
unsafe impl<F> Send for SendHack<F> {}
Expand Down Expand Up @@ -694,6 +726,33 @@
send_message(Message::Pause);
}

extern "C" fn scene_will_connect(_: &Object, _: Sel, notification: ObjcId) {
unsafe {
let scene: ObjcId = msg_send![notification, object];
let is_window_scene: BOOL =
msg_send![scene, isKindOfClass: class!(UIWindowScene)];
if is_window_scene == NO {
return;
}

let (view, view_ctrl) =
match PENDING_SCENE_VIEW_AND_CTRL.with(|cell| cell.borrow_mut().take()) {
Some(pair) => pair,
None => return,
};

let window: ObjcId = msg_send![class!(UIWindow), alloc];
let window: ObjcId = msg_send![window, initWithWindowScene: scene];
msg_send_![window, addSubview: view];
msg_send_![window, setRootViewController: view_ctrl];
msg_send_![window, makeKeyAndVisible];
}
}

extern "C" fn scene_did_activate(_: &Object, _: Sel, _: ObjcId) {
send_message(Message::Resume);
}

unsafe {
decl.add_method(
sel!(application: didFinishLaunchingWithOptions:),
Expand All @@ -708,6 +767,14 @@
sel!(applicationWillResignActive:),
application_will_resign_active as extern "C" fn(&Object, Sel, ObjcId),
);
decl.add_method(
sel!(sceneWillConnect:),
scene_will_connect as extern "C" fn(&Object, Sel, ObjcId),
);
decl.add_method(
sel!(sceneDidActivate:),
scene_did_activate as extern "C" fn(&Object, Sel, ObjcId),
);
}
decl.register()
}
Expand Down
Loading
0