mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-22 04:54:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Formatting.

Browse Source
This commit is contained in:
Camilla Berglund 2010-09-16 05:08:04 +02:00
parent 2999c5d4b8
commit 323e65b3f7
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/cocoa/cocoa_fullscreen.m
View File

@ -29,6 +29,7 @@
#include "internal.h" #include "internal.h"
//======================================================================== //========================================================================
// Check whether the display mode should be included in enumeration // Check whether the display mode should be included in enumeration
//======================================================================== //========================================================================
@ -42,8 +43,8 @@ static BOOL modeIsGood(NSDictionary* mode)
// This seems like a decent compromise, but certain applications may // This seems like a decent compromise, but certain applications may
// wish to patch this... // wish to patch this...
return [[mode objectForKey:(id)kCGDisplayBitsPerPixel] intValue] >= 15 && return [[mode objectForKey:(id)kCGDisplayBitsPerPixel] intValue] >= 15 &&
[mode objectForKey:(id)kCGDisplayModeIsSafeForHardware] != nil && [mode objectForKey:(id)kCGDisplayModeIsSafeForHardware] != nil &&
[mode objectForKey:(id)kCGDisplayModeIsStretched] == nil; [mode objectForKey:(id)kCGDisplayModeIsStretched] == nil;
} }
//======================================================================== //========================================================================
@ -52,9 +53,12 @@ static BOOL modeIsGood(NSDictionary* mode)
static GLFWvidmode vidmodeFromCGDisplayMode(NSDictionary* mode) static GLFWvidmode vidmodeFromCGDisplayMode(NSDictionary* mode)
{ {
unsigned int width = [[mode objectForKey:(id)kCGDisplayWidth] unsignedIntValue]; unsigned int width =
unsigned int height = [[mode objectForKey:(id)kCGDisplayHeight] unsignedIntValue]; [[mode objectForKey:(id)kCGDisplayWidth] unsignedIntValue];
unsigned int bps = [[mode objectForKey:(id)kCGDisplayBitsPerSample] unsignedIntValue]; unsigned int height =
[[mode objectForKey:(id)kCGDisplayHeight] unsignedIntValue];
unsigned int bps =
[[mode objectForKey:(id)kCGDisplayBitsPerSample] unsignedIntValue];
GLFWvidmode result; GLFWvidmode result;
result.width = width; result.width = width;

2
src/cocoa/cocoa_init.m
View File

@ -117,7 +117,7 @@ static NSString* findAppName(void)
// localize(d|able), etc. Loading a nib would save us this horror, but that // localize(d|able), etc. Loading a nib would save us this horror, but that
// doesn't seem like a good thing to require of GLFW's clients. // doesn't seem like a good thing to require of GLFW's clients.
//======================================================================== //========================================================================
static void setUpMenuBar( void ) static void setUpMenuBar(void)
{ {
NSString *appName = findAppName(); NSString *appName = findAppName();