Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-08 06:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

macOS: Embedded window can be dismissed by clicking close

Browse source 
- Installed a SIGINT handler to terminate the application gracefully.
- Handle varying display scaling
This commit is contained in:
Stuart Carnie 2025-05-08 18:51:28 +10:00
parent 19bb18716e
commit f658161619
12 changed files with 144 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

15
platform/macos/os_macos.mm
View file

@ -923,6 +923,14 @@ void OS_MacOS_NSApp::run() {
[NSApp run];
}
static bool sig_received = false;
static void handle_interrupt(int sig) {
if (sig == SIGINT) {
sig_received = true;
}
}
void OS_MacOS_NSApp::start_main() {
Error err;
@autoreleasepool {
@ -954,7 +962,7 @@ void OS_MacOS_NSApp::start_main() {
}
joypad_apple->process_joypads();
if (Main::iteration()) {
if (Main::iteration() || sig_received) {
terminate();
}
} @catch (NSException *exception) {
@ -1020,6 +1028,11 @@ OS_MacOS_NSApp::OS_MacOS_NSApp(const char *p_execpath, int p_argc, char **p_argv
ERR_FAIL_NULL(delegate);
[NSApp setDelegate:delegate];
[NSApp registerUserInterfaceItemSearchHandler:delegate];
struct sigaction action;
memset(&action, 0, sizeof(action));
action.sa_handler = handle_interrupt;
sigaction(SIGINT, &action, nullptr);
}
// MARK: - OS_MacOS_Embedded