Commit dfc56cfc0eae8e09d9da401483655d4e171b6080
2023-01-05T11:54:27
Fix For issue #6948 (#6991) MessageBoxes attached to a window in macOS should use modal APIs and not use a poll/sleep pattern on the main thread. Sleeping the main thread makes the NSWindow message loop sluggish and interferes with external applications that need to send messages to that window, such as VoiceOver.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55
diff --git a/src/video/cocoa/SDL_cocoamessagebox.m b/src/video/cocoa/SDL_cocoamessagebox.m
index 2de717a..a8d8943 100644
--- a/src/video/cocoa/SDL_cocoamessagebox.m
+++ b/src/video/cocoa/SDL_cocoamessagebox.m
@@ -32,8 +32,7 @@
NSInteger clicked;
NSWindow *nswindow;
}
-- (id) initWithParentWindow:(SDL_Window *)window;
-- (void) alertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo;
+- (id)initWithParentWindow:(SDL_Window *)window;
@end
@implementation SDLMessageBoxPresenter
@@ -57,35 +56,16 @@
- (void)showAlert:(NSAlert*)alert
{
if (nswindow) {
-#ifdef MAC_OS_X_VERSION_10_9
- if ([alert respondsToSelector:@selector(beginSheetModalForWindow:completionHandler:)]) {
- [alert beginSheetModalForWindow:nswindow completionHandler:^(NSModalResponse returnCode) {
- self->clicked = returnCode;
- }];
- } else
-#endif
- {
-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
- [alert beginSheetModalForWindow:nswindow modalDelegate:self didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:) contextInfo:nil];
-#endif
- }
-
- while (clicked < 0) {
- SDL_PumpEvents();
- SDL_Delay(100);
- }
-
+ [alert beginSheetModalForWindow:nswindow
+ completionHandler:^(NSModalResponse returnCode) {
+ [NSApp stopModalWithCode:returnCode];
+ }];
+ clicked = [NSApp runModalForWindow:nswindow];
nswindow = nil;
} else {
clicked = [alert runModal];
}
}
-
-- (void) alertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo
-{
- clicked = returnCode;
-}
-
@end