TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 17:35:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

cocoa: fix app launching regression on macOS

Browse Source 
The regression was introduced by ef7f856c46299f4d14711130269f11afad49e4c3

Fixes #227
This commit is contained in:
rdb 2018-01-17 19:46:30 +01:00
parent 4c4288f491
commit fe0c182830
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
panda/src/cocoadisplay/cocoaGraphicsPipe.mm
View File

@ -15,7 +15,6 @@
#include "cocoaGraphicsBuffer.h"
#include "cocoaGraphicsWindow.h"
#include "cocoaGraphicsStateGuardian.h"
#include "cocoaPandaApp.h"
#include "config_cocoadisplay.h"
#include "frameBufferProperties.h"
#include "displayInformation.h"

3
panda/src/cocoadisplay/cocoaGraphicsWindow.mm
View File

@ -15,6 +15,7 @@
#include "cocoaGraphicsStateGuardian.h"
#include "config_cocoadisplay.h"
#include "cocoaGraphicsPipe.h"
#include "cocoaPandaApp.h"
#include "graphicsPipe.h"
#include "keyboardButton.h"
@ -68,6 +69,8 @@ CocoaGraphicsWindow(GraphicsEngine *engine, GraphicsPipe *pipe,
// Now that we know for sure we want a window, we can create the Cocoa app.
// This will cause the application icon to appear and start bouncing.
if (NSApp == nil) {
[CocoaPandaApp sharedApplication];
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
[NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
#endif