Skip to content

Commit

Permalink
Removed isCustom ... not used any more.
Browse files Browse the repository at this point in the history
  • Loading branch information
icculus committed Sep 29, 2009
1 parent 7aeb3cd commit 48556b2
Showing 1 changed file with 7 additions and 15 deletions.
22 changes: 7 additions & 15 deletions src/video/quartz/SDL_QuartzVideo.m
Expand Up @@ -461,7 +461,6 @@ static void QZ_UnsetVideoMode (_THIS, BOOL to_desktop) {
NSRect screen_rect;
CGError error;
NSRect contentRect;
BOOL isCustom = NO;
CGDisplayFadeReservationToken fade_token = kCGDisplayFadeReservationInvalidToken;

/* Fade to black to hide resolution-switching flicker (and garbage
Expand Down Expand Up @@ -577,11 +576,9 @@ other blitting while waiting on the VBL (and hence results in higher framerates)
}
/* We already have a window, just change its size */
else {
if (!isCustom) {
[ qz_window setContentSize:contentRect.size ];
current->flags |= (SDL_NOFRAME|SDL_RESIZABLE) & mode_flags;
[ window_view setFrameSize:contentRect.size ];
}
[ qz_window setContentSize:contentRect.size ];
current->flags |= (SDL_NOFRAME|SDL_RESIZABLE) & mode_flags;
[ window_view setFrameSize:contentRect.size ];
}

/* Setup OpenGL for a fullscreen context */
Expand Down Expand Up @@ -660,7 +657,6 @@ other blitting while waiting on the VBL (and hence results in higher framerates)
int height, int *bpp, Uint32 flags) {
unsigned int style;
NSRect contentRect;
BOOL isCustom = NO;
int center_window = 1;
int origin_x, origin_y;
CGDisplayFadeReservationToken fade_token = kCGDisplayFadeReservationInvalidToken;
Expand Down Expand Up @@ -745,8 +741,7 @@ other blitting while waiting on the VBL (and hence results in higher framerates)
/* 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))];
center_window = 0;
}
else if ( center_window ) {
} else if ( center_window ) {
[ qz_window center ];
}

Expand All @@ -756,12 +751,9 @@ other blitting while waiting on the VBL (and hence results in higher framerates)
}
/* We already have a window, just change its size */
else {

if (!isCustom) {
[ qz_window setContentSize:contentRect.size ];
current->flags |= (SDL_NOFRAME|SDL_RESIZABLE) & mode_flags;
[ window_view setFrameSize:contentRect.size ];
}
[ qz_window setContentSize:contentRect.size ];
current->flags |= (SDL_NOFRAME|SDL_RESIZABLE) & mode_flags;
[ window_view setFrameSize:contentRect.size ];
}

/* For OpenGL, we bind the context to a subview */
Expand Down

0 comments on commit 48556b2

Please sign in to comment.