Mercurial > sdl-ios-xcode

changeset 4267:27f972dd5aff SDL-1.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed isCustom ... not used any more.
author Ryan C. Gordon <icculus@icculus.org>
date Tue, 29 Sep 2009 13:42:33 +0000
parents 62849663f20a
children d48035d857d3
files src/video/quartz/SDL_QuartzVideo.m
diffstat 1 files changed, 7 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/src/video/quartz/SDL_QuartzVideo.m	Tue Sep 29 13:40:34 2009 +0000
+++ b/src/video/quartz/SDL_QuartzVideo.m	Tue Sep 29 13:42:33 2009 +0000
@@ -461,7 +461,6 @@
     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 @@
     }
     /* 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 @@
                                          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 @@
             /* 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 @@
     }
     /* 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 */