Commit e4f25572 authored by Sam Lantinga's avatar Sam Lantinga

On multi-display systems it's perfectly reasonable to have focus on a window...

On multi-display systems it's perfectly reasonable to have focus on a window on another monitor while the application is fullscreen.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%404252
parent 615000a3
...@@ -147,7 +147,6 @@ struct SDL_Window ...@@ -147,7 +147,6 @@ struct SDL_Window
#define FULLSCREEN_VISIBLE(W) \ #define FULLSCREEN_VISIBLE(W) \
(((W)->flags & SDL_WINDOW_FULLSCREEN) && \ (((W)->flags & SDL_WINDOW_FULLSCREEN) && \
((W)->flags & SDL_WINDOW_SHOWN) && \ ((W)->flags & SDL_WINDOW_SHOWN) && \
((W)->flags & SDL_WINDOW_INPUT_FOCUS) && \
!((W)->flags & SDL_WINDOW_MINIMIZED)) !((W)->flags & SDL_WINDOW_MINIMIZED))
/* /*
......
...@@ -1435,7 +1435,6 @@ SDL_OnWindowFocusGained(SDL_Window * window) ...@@ -1435,7 +1435,6 @@ SDL_OnWindowFocusGained(SDL_Window * window)
{ {
SDL_VideoDisplay *display = SDL_GetDisplayFromWindow(window); SDL_VideoDisplay *display = SDL_GetDisplayFromWindow(window);
SDL_UpdateFullscreenMode(window, SDL_TRUE);
if (display->gamma && _this->SetDisplayGammaRamp) { if (display->gamma && _this->SetDisplayGammaRamp) {
_this->SetDisplayGammaRamp(_this, display, display->gamma); _this->SetDisplayGammaRamp(_this, display, display->gamma);
} }
...@@ -1450,7 +1449,6 @@ SDL_OnWindowFocusLost(SDL_Window * window) ...@@ -1450,7 +1449,6 @@ SDL_OnWindowFocusLost(SDL_Window * window)
{ {
SDL_VideoDisplay *display = SDL_GetDisplayFromWindow(window); SDL_VideoDisplay *display = SDL_GetDisplayFromWindow(window);
SDL_UpdateFullscreenMode(window, SDL_FALSE);
if (display->gamma && _this->SetDisplayGammaRamp) { if (display->gamma && _this->SetDisplayGammaRamp) {
_this->SetDisplayGammaRamp(_this, display, display->saved_gamma); _this->SetDisplayGammaRamp(_this, display, display->saved_gamma);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment