Mercurial > sdl-ios-xcode

changeset 4856:1ff5dfaafdc8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Condensed flag-setting code and put parantheses in the appropriate places. It was that, in the end.
author egottlieb
date Mon, 16 Aug 2010 01:17:19 -0400
parents 6d4d6605a0d3
children 579dabb141ea
files src/video/SDL_shape.c src/video/win32/SDL_win32shape.c
diffstat 2 files changed, 2 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/video/SDL_shape.c	Sun Aug 15 23:57:50 2010 -0400
+++ b/src/video/SDL_shape.c	Mon Aug 16 01:17:19 2010 -0400
@@ -33,11 +33,7 @@
 SDL_Window*
 SDL_CreateShapedWindow(const char *title,unsigned int x,unsigned int y,unsigned int w,unsigned int h,Uint32 flags) {
     SDL_Window *result = NULL;
-    flags |= SDL_WINDOW_BORDERLESS;
-    flags &= (~SDL_WINDOW_RESIZABLE);
-    flags &= (~SDL_WINDOW_FULLSCREEN);
-    //flags &= (~SDL_WINDOW_SHOWN);
-    result = SDL_CreateWindow(title,x,y,w,h,flags | SDL_WINDOW_BORDERLESS & ~SDL_WINDOW_FULLSCREEN & ~SDL_WINDOW_RESIZABLE);
+    result = SDL_CreateWindow(title,x,y,w,h,(flags | SDL_WINDOW_BORDERLESS) & (~SDL_WINDOW_FULLSCREEN) & (~SDL_WINDOW_RESIZABLE) /*& (~SDL_WINDOW_SHOWN)*/);
     if(result != NULL) {
         result->shaper = result->display->device->shape_driver.CreateShaper(result);
         if(result->shaper != NULL) {
--- a/src/video/win32/SDL_win32shape.c	Sun Aug 15 23:57:50 2010 -0400
+++ b/src/video/win32/SDL_win32shape.c	Mon Aug 16 01:17:19 2010 -0400
@@ -40,7 +40,7 @@
     resized_properly = Win32_ResizeWindowShape(window);
     if (resized_properly != 0)
             return NULL;
-
+    
     return result;
 }