Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-10-03 21:30:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge b03ee5bc1b into 8f0fd7ecf5

Browse Source
This commit is contained in:
Jared Jones 2015-05-18 20:58:46 +00:00
commit 8e1c0ae345
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/cocoa_window.m
View File

@ -651,6 +651,17 @@ static int translateKey(unsigned int key)
return YES; return YES;
} }
- (float)titleBarHeight
{
NSRect frame = NSMakeRect (0, 0, 100, 100);
NSRect contentRect;
contentRect = [NSWindow contentRectForFrameRect: frame
styleMask: NSTitledWindowMask];
return (frame.size.height - contentRect.size.height);
}
@end @end
@ -911,6 +922,10 @@ static GLboolean createWindow(_GLFWwindow* window,
[window->ns.object setAcceptsMouseMovedEvents:YES]; [window->ns.object setAcceptsMouseMovedEvents:YES];
[window->ns.object setContentView:window->ns.view]; [window->ns.object setContentView:window->ns.view];
// OS X puts an application into "App Nap" if it's window size drops below 4-pixels.
NSUInteger minWindowHeight = 4;
[window->ns.object setMinSize:NSMakeSize(0, [window->ns.object titleBarHeight] + minWindowHeight)];
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_6) if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_6)
[window->ns.object setRestorable:NO]; [window->ns.object setRestorable:NO];