Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix new UIScene flow on the latest iOS

Browse Source
This commit is contained in:
Wojciech Figat
2026-05-13 22:33:31 +02:00
parent dcccc4687d
commit f83488355d
2 changed files with 78 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Engine/Platform/iOS/iOSApp.h
+1 -1
View File
@@ -23,7 +23,7 @@ FLAXENGINE_API
@end @end
FLAXENGINE_API FLAXENGINE_API
@interface FlaxAppDelegate : UIResponder <UIApplicationDelegate> @interface FlaxAppDelegate : UIResponder <UIApplicationDelegate, UIWindowSceneDelegate>
@property(strong, retain, nonatomic) UIWindow* window; @property(strong, retain, nonatomic) UIWindow* window;
@property(strong, retain, nonatomic) FlaxViewController* viewController; @property(strong, retain, nonatomic) FlaxViewController* viewController;
Source/Engine/Platform/iOS/iOSPlatform.cpp
+77 -5
View File
@@ -248,11 +248,13 @@ MessagePipeline MainThreadPipeline;
UIThreadPipeline.Run(); UIThreadPipeline.Run();
} }
- (BOOL)application:(UIApplication*)application didFinishLaunchingWithOptions:(NSDictionary*)launchOptions - (void)scene:(UIScene*)scene willConnectToSession:(UISceneSession*)session options:(UISceneConnectionOptions*)connectionOptions
{ {
//LOG(Info, "[iOS] willConnectToSession");
// Create window // Create window
CGRect frame = [[UIScreen mainScreen] bounds]; CGRect frame = [[UIScreen mainScreen] bounds];
self.window = [[UIWindow alloc] initWithFrame:frame]; self.window = [[UIWindow alloc] initWithWindowScene:(UIWindowScene*)scene];
// Create view // Create view
self.view = [[FlaxView alloc] initWithFrame:frame]; self.view = [[FlaxView alloc] initWithFrame:frame];
@@ -271,10 +273,80 @@ MessagePipeline MainThreadPipeline;
[self.viewController setNeedsStatusBarAppearanceUpdate]; [self.viewController setNeedsStatusBarAppearanceUpdate];
MainViewController = self.viewController; MainViewController = self.viewController;
// Create navigation controller // Link controller and show window
UINavigationController* navController = [[UINavigationController alloc] initWithRootViewController:self.viewController]; self.window.rootViewController = MainViewController;
[self.window setRootViewController:navController];
[self.window makeKeyAndVisible]; [self.window makeKeyAndVisible];
}
- (UISceneConfiguration*)application:(UIApplication*)application configurationForConnectingSceneSession:(UISceneSession*)connectingSceneSession options:(UISceneConnectionOptions*)options API_AVAILABLE(ios(13.0), tvos(13.0), visionos(1.0))
{
LOG(Info, "[iOS] configurationForConnectingSceneSession");
UISceneConfiguration* config = [[UISceneConfiguration alloc] initWithName:@"Default Configuration" sessionRole:connectingSceneSession.role];
config.delegateClass = [FlaxAppDelegate class];
return config;
}
- (void)application:(UIApplication*)application didDiscardSceneSessions:(NSSet<UISceneSession*>*)sceneSessions API_AVAILABLE(ios(13.0), tvos(13.0), visionos(1.0))
{
LOG(Info, "[iOS] didDiscardSceneSessions");
}
- (void)sceneDidDisconnect:(UIScene*)scene API_AVAILABLE(ios(13.0), tvos(13.0), visionos(1.0))
{
LOG(Info, "[iOS] sceneDidDisconnect");
}
- (void)sceneDidBecomeActive:(UIScene*)scene API_AVAILABLE(ios(13.0), tvos(13.0), visionos(1.0))
{
LOG(Info, "[iOS] sceneDidBecomeActive");
// Focus app
HasFocus = true;
if (MainWindow)
{
Function<void()> func = []()
{
MainWindow->OnGotFocus();
};
iOSPlatform::RunOnMainThread(func);
}
}
- (void)sceneWillResignActive:(UIScene*)scene API_AVAILABLE(ios(13.0), tvos(13.0), visionos(1.0))
{
LOG(Info, "[iOS] sceneWillResignActive");
// Defocus app
HasFocus = false;
if (MainWindow)
{
Function<void()> func = []()
{
MainWindow->OnLostFocus();
};
iOSPlatform::RunOnMainThread(func);
}
}
- (void)sceneDidEnterBackground:(UIScene*)scene API_AVAILABLE(ios(13.0), tvos(13.0), visionos(1.0))
{
LOG(Info, "[iOS] sceneDidEnterBackground");
// Pause
IsPaused = true;
}
- (void)sceneWillEnterForeground:(UIScene*)scene API_AVAILABLE(ios(13.0), tvos(13.0), visionos(1.0))
{
LOG(Info, "[iOS] sceneDidEnterBackground");
// Resume
IsPaused = false;
}
- (BOOL)application:(UIApplication*)application didFinishLaunchingWithOptions:(NSDictionary*)launchOptions
{
//LOG(Info, "[iOS] didFinishLaunchingWithOptions");
// Create UI thread update callback // Create UI thread update callback
self.displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(UIThreadMain)]; self.displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(UIThreadMain)];