[Scummvm-git-logs] scummvm master -> f27c428d44731544b6f9fc56a8d14ea7e8e97ba0

[larsamannen]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
f27c428d44 IOS7: Make tvOS run again


Commit: f27c428d44731544b6f9fc56a8d14ea7e8e97ba0
    https://github.com/scummvm/scummvm/commit/f27c428d44731544b6f9fc56a8d14ea7e8e97ba0
Author: Lars Sundström (l.sundstrom at gmail.com)
Date: 2026-03-26T07:57:09+01:00

Commit Message:
IOS7: Make tvOS run again

When changing the window handling to use UIScene, tvOS was not
tested properly. Make setKeyWindow available on tvOS as well and
make sure isiOSAppOnMac returns false for tvOS.

Changed paths:
    backends/platform/ios7/ios7_app_delegate.mm
    backends/platform/ios7/ios7_osys_video.mm


diff --git a/backends/platform/ios7/ios7_app_delegate.mm b/backends/platform/ios7/ios7_app_delegate.mm
index da8f8385be5..c48cf231e6f 100644
--- a/backends/platform/ios7/ios7_app_delegate.mm
+++ b/backends/platform/ios7/ios7_app_delegate.mm
@@ -160,12 +160,6 @@
 	return appDelegate->_view;
 }
 
-#if TARGET_OS_IOS
-+ (UIInterfaceOrientation)currentOrientation {
-	iOS7AppDelegate *appDelegate = [self iOS7AppDelegate];
-	return [appDelegate->_controller currentOrientation];
-}
-
 + (void)setKeyWindow:(UIWindow *)window {
 	iOS7AppDelegate *appDelegate = [self iOS7AppDelegate];
 	appDelegate->_window = window;
@@ -173,6 +167,13 @@
 	[appDelegate->_window setRootViewController:appDelegate->_controller];
 	[appDelegate->_window makeKeyAndVisible];
 }
+
+#if TARGET_OS_IOS
++ (UIInterfaceOrientation)currentOrientation {
+	iOS7AppDelegate *appDelegate = [self iOS7AppDelegate];
+	return [appDelegate->_controller currentOrientation];
+}
+
 #endif
 
 @end
diff --git a/backends/platform/ios7/ios7_osys_video.mm b/backends/platform/ios7/ios7_osys_video.mm
index 4ebf6d0945a..08157bc7bf0 100644
--- a/backends/platform/ios7/ios7_osys_video.mm
+++ b/backends/platform/ios7/ios7_osys_video.mm
@@ -169,9 +169,11 @@ void OSystem_iOS7::virtualController(bool connect) {
 
 bool OSystem_iOS7::isiOSAppOnMac() const {
 	__block bool isiOSAppOnMac = false;
+#if TARGET_OS_IOS
 	execute_on_main_thread(^ {
 		isiOSAppOnMac = [[iOS7AppDelegate iPhoneView] isiOSAppOnMac];
 	});
+#endif
 	return isiOSAppOnMac;
 }