pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed isCustom ... not used any more.

Browse source 
--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%403946
This commit is contained in:
Ryan C. Gordon 2009-09-29 13:42:33 +00:00
parent 5e4d01fd76
commit 6e3f41a14a
1 changed files with 7 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/video/quartz/SDL_QuartzVideo.m
View file

@ -461,7 +461,6 @@ static SDL_Surface* QZ_SetVideoFullScreen (_THIS, SDL_Surface *current, int widt
NSRect screen_rect; NSRect screen_rect;
CGError error; CGError error;
NSRect contentRect; NSRect contentRect;
BOOL isCustom = NO;
CGDisplayFadeReservationToken fade_token = kCGDisplayFadeReservationInvalidToken; CGDisplayFadeReservationToken fade_token = kCGDisplayFadeReservationInvalidToken;
/* Fade to black to hide resolution-switching flicker (and garbage /* Fade to black to hide resolution-switching flicker (and garbage
@ -577,12 +576,10 @@ static SDL_Surface* QZ_SetVideoFullScreen (_THIS, SDL_Surface *current, int widt
} }
/* We already have a window, just change its size */ /* We already have a window, just change its size */
else { else {
if (!isCustom) {
[ qz_window setContentSize:contentRect.size ]; [ qz_window setContentSize:contentRect.size ];
current->flags |= (SDL_NOFRAME|SDL_RESIZABLE) & mode_flags; current->flags |= (SDL_NOFRAME|SDL_RESIZABLE) & mode_flags;
[ window_view setFrameSize:contentRect.size ]; [ window_view setFrameSize:contentRect.size ];
} }
}
/* Setup OpenGL for a fullscreen context */ /* Setup OpenGL for a fullscreen context */
if (flags & SDL_OPENGL) { if (flags & SDL_OPENGL) {
@ -660,7 +657,6 @@ static SDL_Surface* QZ_SetVideoWindowed (_THIS, SDL_Surface *current, int width,
int height, int *bpp, Uint32 flags) { int height, int *bpp, Uint32 flags) {
unsigned int style; unsigned int style;
NSRect contentRect; NSRect contentRect;
BOOL isCustom = NO;
int center_window = 1; int center_window = 1;
int origin_x, origin_y; int origin_x, origin_y;
CGDisplayFadeReservationToken fade_token = kCGDisplayFadeReservationInvalidToken; CGDisplayFadeReservationToken fade_token = kCGDisplayFadeReservationInvalidToken;
@ -745,8 +741,7 @@ static SDL_Surface* QZ_SetVideoWindowed (_THIS, SDL_Surface *current, int width,
/* have to flip the Y value (NSPoint is lower left corner origin) */ /* have to flip the Y value (NSPoint is lower left corner origin) */
[ qz_window setFrameTopLeftPoint:NSMakePoint((float) origin_x, (float) (this->info.current_h - origin_y))]; [ qz_window setFrameTopLeftPoint:NSMakePoint((float) origin_x, (float) (this->info.current_h - origin_y))];
center_window = 0; center_window = 0;
} } else if ( center_window ) {
else if ( center_window ) {
[ qz_window center ]; [ qz_window center ];
} }
@ -756,13 +751,10 @@ static SDL_Surface* QZ_SetVideoWindowed (_THIS, SDL_Surface *current, int width,
} }
/* We already have a window, just change its size */ /* We already have a window, just change its size */
else { else {
if (!isCustom) {
[ qz_window setContentSize:contentRect.size ]; [ qz_window setContentSize:contentRect.size ];
current->flags |= (SDL_NOFRAME|SDL_RESIZABLE) & mode_flags; current->flags |= (SDL_NOFRAME|SDL_RESIZABLE) & mode_flags;
[ window_view setFrameSize:contentRect.size ]; [ window_view setFrameSize:contentRect.size ];
} }
}
/* For OpenGL, we bind the context to a subview */ /* For OpenGL, we bind the context to a subview */
if ( flags & SDL_OPENGL ) { if ( flags & SDL_OPENGL ) {