mirror of
https://github.com/Relintai/sdl2_frt.git
synced 2024-12-20 22:16:49 +01:00
Mac: Fix the menu bar not always working for non-.app-bundled apps. Fixes bug #3051.
This commit is contained in:
parent
c44e741bd9
commit
fb071a4cd9
@ -216,6 +216,18 @@ static void Cocoa_DispatchEvent(NSEvent *theEvent)
|
|||||||
{
|
{
|
||||||
return (BOOL)SDL_SendDropFile(NULL, [filename UTF8String]) && SDL_SendDropComplete(NULL);
|
return (BOOL)SDL_SendDropFile(NULL, [filename UTF8String]) && SDL_SendDropComplete(NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (void)applicationDidFinishLaunching:(NSNotification *)notification
|
||||||
|
{
|
||||||
|
/* The menu bar of SDL apps which don't have the typical .app bundle
|
||||||
|
* structure fails to work the first time a window is created (until it's
|
||||||
|
* de-focused and re-focused), if this call is in Cocoa_RegisterApp instead
|
||||||
|
* of here. https://bugzilla.libsdl.org/show_bug.cgi?id=3051
|
||||||
|
*/
|
||||||
|
if (!SDL_GetHintBoolean(SDL_HINT_MAC_BACKGROUND_APP, SDL_FALSE)) {
|
||||||
|
[NSApp activateIgnoringOtherApps:YES];
|
||||||
|
}
|
||||||
|
}
|
||||||
@end
|
@end
|
||||||
|
|
||||||
static SDLAppDelegate *appDelegate = nil;
|
static SDLAppDelegate *appDelegate = nil;
|
||||||
@ -361,7 +373,6 @@ Cocoa_RegisterApp(void)
|
|||||||
|
|
||||||
if (!SDL_GetHintBoolean(SDL_HINT_MAC_BACKGROUND_APP, SDL_FALSE)) {
|
if (!SDL_GetHintBoolean(SDL_HINT_MAC_BACKGROUND_APP, SDL_FALSE)) {
|
||||||
[NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
|
[NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
|
||||||
[NSApp activateIgnoringOtherApps:YES];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ([NSApp mainMenu] == nil) {
|
if ([NSApp mainMenu] == nil) {
|
||||||
|
Loading…
Reference in New Issue
Block a user