From 48556b28916909bb27792341e442b680cf65b288 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Tue, 29 Sep 2009 13:42:33 +0000 Subject: [PATCH] Removed isCustom ... not used any more. --- src/video/quartz/SDL_QuartzVideo.m | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/src/video/quartz/SDL_QuartzVideo.m b/src/video/quartz/SDL_QuartzVideo.m index 309db5dd5..e37720243 100644 --- a/src/video/quartz/SDL_QuartzVideo.m +++ b/src/video/quartz/SDL_QuartzVideo.m @@ -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 @@ -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 */ @@ -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; @@ -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 ]; } @@ -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 */