comparison src/video/cocoa/SDL_cocoamodes.m @ 3280:00cace2d9080

Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009
author Sam Lantinga <slouken@libsdl.org>
date Sat, 19 Sep 2009 13:29:40 +0000
parents cde30895105d
children 4b594623401b
comparison
equal deleted inserted replaced
3279:fd207dce9f94 3280:00cace2d9080
248 if (fade_token != kCGDisplayFadeReservationInvalidToken) { 248 if (fade_token != kCGDisplayFadeReservationInvalidToken) {
249 CGDisplayFade(fade_token, 0.5, kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0.0, 0.0, 0.0, FALSE); 249 CGDisplayFade(fade_token, 0.5, kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0.0, 0.0, 0.0, FALSE);
250 CGReleaseDisplayFadeReservation(fade_token); 250 CGReleaseDisplayFadeReservation(fade_token);
251 } 251 }
252 252
253 [[NSApp mainWindow] makeKeyAndOrderFront: nil];
254
253 #if MAC_OS_X_VERSION_MAX_ALLOWED < 1050 255 #if MAC_OS_X_VERSION_MAX_ALLOWED < 1050
254 /* 256 /*
255 There is a bug in Cocoa where NSScreen doesn't synchronize 257 There is a bug in Cocoa where NSScreen doesn't synchronize
256 with CGDirectDisplay, so the main screen's frame is wrong. 258 with CGDirectDisplay, so the main screen's frame is wrong.
257 As a result, coordinate translation produces incorrect results. 259 As a result, coordinate translation produces incorrect results.