From 22e1aa6cfcb93779040d5b465dc077aa2f3a8245 Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Sun, 16 Jun 2013 20:27:35 +0200 Subject: [PATCH] Fixed process transform when no menu bar. --- README.md | 2 ++ src/cocoa_window.m | 16 ++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index cf1b4b5f..a8ad02d8 100644 --- a/README.md +++ b/README.md @@ -106,6 +106,8 @@ See the [GLFW 3.0 documentation](http://www.glfw.org/docs/3.0/). coordinates - [Cocoa] Bugfix: Messages not supported on Mac OS X 10.6 were used without tests for precence + - [Cocoa] Bugfix: Process transformation was not performed if menu bar creation + was disabled - [Win32] Bugfix: Context creation was attempted even if no valid pixel formats had been found - [X11] Bugfix: Duplicate window position and window and framebuffer size diff --git a/src/cocoa_window.m b/src/cocoa_window.m index cb153860..9fe011c7 100644 --- a/src/cocoa_window.m +++ b/src/cocoa_window.m @@ -688,14 +688,6 @@ static NSString* findAppName(void) } } - // If we get here, the application is unbundled - ProcessSerialNumber psn = { 0, kCurrentProcess }; - TransformProcessType(&psn, kProcessTransformToForegroundApplication); - - // Having the app in front of the terminal window is also generally - // handy. There is an NSApplication API to do this, but... - SetFrontProcess(&psn); - char** progname = _NSGetProgname(); if (progname && *progname) return [NSString stringWithUTF8String:*progname]; @@ -781,6 +773,14 @@ static GLboolean initializeAppKit(void) // Implicitly create shared NSApplication instance [GLFWApplication sharedApplication]; + // If we get here, the application is unbundled + ProcessSerialNumber psn = { 0, kCurrentProcess }; + TransformProcessType(&psn, kProcessTransformToForegroundApplication); + + // Having the app in front of the terminal window is also generally + // handy. There is an NSApplication API to do this, but... + SetFrontProcess(&psn); + #if defined(_GLFW_USE_MENUBAR) // Menu bar setup must go between sharedApplication above and // finishLaunching below, in order to properly emulate the behavior