mirror of
https://github.com/glfw/glfw.git
synced 2026-09-20 16:30:45 +00:00
Cocoa: Fix menubar for unbundled apps on 10.15
NSApp setActivationPolicy: was being called too soon when the app was
not bundled and launched from the command line.
This fix is based on #1802 by @richardwilkes.
Fixes #1648.
Closes #1802.
Adapted to 3.3-stable from 8b11867464.
This commit is contained in:
+2
-3
@@ -428,9 +428,6 @@ static GLFWbool initializeTIS(void)
|
||||
{
|
||||
if (_glfw.hints.init.ns.menubar)
|
||||
{
|
||||
// In case we are unbundled, make us a proper UI application
|
||||
[NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
|
||||
|
||||
// Menu bar setup must go between sharedApplication and finishLaunching
|
||||
// in order to properly emulate the behavior of NSApplicationMain
|
||||
|
||||
@@ -449,6 +446,8 @@ static GLFWbool initializeTIS(void)
|
||||
{
|
||||
_glfw.ns.finishedLaunching = GLFW_TRUE;
|
||||
_glfwPlatformPostEmptyEvent();
|
||||
// In case we are unbundled, make us a proper UI application
|
||||
[NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
|
||||
[NSApp stop:nil];
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user