src/video/windows/SDL_windowswindow.c
changeset 7191 75360622e65f
parent 7089 257fc4e541e1
child 7523 9e9ab1dc3811
     1.1 --- a/src/video/windows/SDL_windowswindow.c	Sat May 18 12:48:50 2013 -0700
     1.2 +++ b/src/video/windows/SDL_windowswindow.c	Sat May 18 14:17:52 2013 -0700
     1.3 @@ -201,7 +201,7 @@
     1.4      DWORD style = STYLE_BASIC;
     1.5      int x, y;
     1.6      int w, h;
     1.7 -    
     1.8 +
     1.9      style |= GetWindowStyle(window);
    1.10  
    1.11      /* Figure out what the window area will be */
    1.12 @@ -352,7 +352,7 @@
    1.13  
    1.14      /* Figure out what the window area will be */
    1.15      if ( SDL_ShouldAllowTopmost() && (window->flags & (SDL_WINDOW_FULLSCREEN|SDL_WINDOW_INPUT_FOCUS)) == (SDL_WINDOW_FULLSCREEN|SDL_WINDOW_INPUT_FOCUS )) {
    1.16 -		top = HWND_TOPMOST;
    1.17 +        top = HWND_TOPMOST;
    1.18      } else {
    1.19          top = HWND_NOTOPMOST;
    1.20      }
    1.21 @@ -403,11 +403,11 @@
    1.22      HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
    1.23      HWND top;
    1.24  
    1.25 -	if ( SDL_ShouldAllowTopmost() && (window->flags & (SDL_WINDOW_FULLSCREEN|SDL_WINDOW_INPUT_FOCUS)) == (SDL_WINDOW_FULLSCREEN|SDL_WINDOW_INPUT_FOCUS )) {
    1.26 -		top = HWND_TOPMOST;
    1.27 -	} else {
    1.28 -		top = HWND_NOTOPMOST;
    1.29 -	}
    1.30 +    if ( SDL_ShouldAllowTopmost() && (window->flags & (SDL_WINDOW_FULLSCREEN|SDL_WINDOW_INPUT_FOCUS)) == (SDL_WINDOW_FULLSCREEN|SDL_WINDOW_INPUT_FOCUS )) {
    1.31 +        top = HWND_TOPMOST;
    1.32 +    } else {
    1.33 +        top = HWND_NOTOPMOST;
    1.34 +    }
    1.35      SetWindowPos(hwnd, top, 0, 0, 0, 0, (SWP_NOMOVE | SWP_NOSIZE));
    1.36  }
    1.37  
    1.38 @@ -464,11 +464,11 @@
    1.39      int x, y;
    1.40      int w, h;
    1.41  
    1.42 -	if ( SDL_ShouldAllowTopmost() && (window->flags & (SDL_WINDOW_FULLSCREEN|SDL_WINDOW_INPUT_FOCUS)) == (SDL_WINDOW_FULLSCREEN|SDL_WINDOW_INPUT_FOCUS )) {
    1.43 -		top = HWND_TOPMOST;
    1.44 -	} else {
    1.45 -		top = HWND_NOTOPMOST;
    1.46 -	}
    1.47 +    if ( SDL_ShouldAllowTopmost() && (window->flags & (SDL_WINDOW_FULLSCREEN|SDL_WINDOW_INPUT_FOCUS)) == (SDL_WINDOW_FULLSCREEN|SDL_WINDOW_INPUT_FOCUS )) {
    1.48 +        top = HWND_TOPMOST;
    1.49 +    } else {
    1.50 +        top = HWND_NOTOPMOST;
    1.51 +    }
    1.52  
    1.53      style = GetWindowLong(hwnd, GWL_STYLE);
    1.54      style &= ~STYLE_MASK;
    1.55 @@ -550,22 +550,22 @@
    1.56          ClipCursor(NULL);
    1.57      }
    1.58  
    1.59 -	if ( window->flags & SDL_WINDOW_FULLSCREEN )
    1.60 -	{
    1.61 -		HWND top;
    1.62 -		SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
    1.63 -		HWND hwnd = data->hwnd;
    1.64 -		UINT flags = SWP_NOMOVE | SWP_NOSIZE;
    1.65 +    if ( window->flags & SDL_WINDOW_FULLSCREEN )
    1.66 +    {
    1.67 +        HWND top;
    1.68 +        SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
    1.69 +        HWND hwnd = data->hwnd;
    1.70 +        UINT flags = SWP_NOMOVE | SWP_NOSIZE;
    1.71  
    1.72 -		if ( SDL_ShouldAllowTopmost() && (window->flags & SDL_WINDOW_INPUT_FOCUS ) ) {
    1.73 -			top = HWND_TOPMOST;
    1.74 -		} else {
    1.75 -			top = HWND_NOTOPMOST;
    1.76 -			flags |= SWP_NOZORDER;
    1.77 -		}
    1.78 -		
    1.79 -		SetWindowPos(hwnd, top, 0, 0, 0, 0, flags);
    1.80 -	}
    1.81 +        if ( SDL_ShouldAllowTopmost() && (window->flags & SDL_WINDOW_INPUT_FOCUS ) ) {
    1.82 +            top = HWND_TOPMOST;
    1.83 +        } else {
    1.84 +            top = HWND_NOTOPMOST;
    1.85 +            flags |= SWP_NOZORDER;
    1.86 +        }
    1.87 +
    1.88 +        SetWindowPos(hwnd, top, 0, 0, 0, 0, flags);
    1.89 +    }
    1.90  }
    1.91  
    1.92  void