encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't minimize fullscreen windows when destroying them. 

Previously, we'd minimize fullscreen windows (if
SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS was set) during SDL_DestroyWindow if they
had keyboard focus, because we call SDL_SetKeyboardFocus(NULL) which yields a
OnWindowsFocusLost event.

Related to https://bugzilla.libsdl.org/show_bug.cgi?id=1840
This commit is contained in:
J?rgen P. Tjern? 2014-01-15 11:34:03 -08:00
parent bc92383eea
commit 12e7fdcbb6
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/video/SDL_sysvideo.h
View File

@ -93,6 +93,8 @@ struct SDL_Window
SDL_Surface *surface; SDL_Surface *surface;
SDL_bool surface_valid; SDL_bool surface_valid;
SDL_bool is_destroying;
SDL_WindowShaper *shaper; SDL_WindowShaper *shaper;
SDL_WindowUserData *data; SDL_WindowUserData *data;

7
src/video/SDL_video.c
View File

@ -1288,6 +1288,7 @@ SDL_CreateWindow(const char *title, int x, int y, int w, int h, Uint32 flags)
window->last_fullscreen_flags = window->flags; window->last_fullscreen_flags = window->flags;
window->brightness = 1.0f; window->brightness = 1.0f;
window->next = _this->windows; window->next = _this->windows;
window->is_destroying = SDL_FALSE;
if (_this->windows) { if (_this->windows) {
_this->windows->prev = window; _this->windows->prev = window;
@ -1328,6 +1329,7 @@ SDL_CreateWindowFrom(const void *data)
window->id = _this->next_object_id++; window->id = _this->next_object_id++;
window->flags = SDL_WINDOW_FOREIGN; window->flags = SDL_WINDOW_FOREIGN;
window->last_fullscreen_flags = window->flags; window->last_fullscreen_flags = window->flags;
window->is_destroying = SDL_FALSE;
window->brightness = 1.0f; window->brightness = 1.0f;
window->next = _this->windows; window->next = _this->windows;
if (_this->windows) { if (_this->windows) {
@ -1389,6 +1391,7 @@ SDL_RecreateWindow(SDL_Window * window, Uint32 flags)
window->icon = NULL; window->icon = NULL;
window->flags = ((flags & CREATE_FLAGS) | SDL_WINDOW_HIDDEN); window->flags = ((flags & CREATE_FLAGS) | SDL_WINDOW_HIDDEN);
window->last_fullscreen_flags = window->flags; window->last_fullscreen_flags = window->flags;
window->is_destroying = SDL_FALSE;
if (_this->CreateWindow && !(flags & SDL_WINDOW_FOREIGN)) { if (_this->CreateWindow && !(flags & SDL_WINDOW_FOREIGN)) {
if (_this->CreateWindow(_this, window) < 0) { if (_this->CreateWindow(_this, window) < 0) {
@ -2169,7 +2172,7 @@ ShouldMinimizeOnFocusLoss(SDL_Window * window)
{ {
const char *hint; const char *hint;
if (!(window->flags & SDL_WINDOW_FULLSCREEN)) { if (!(window->flags & SDL_WINDOW_FULLSCREEN) || window->is_destroying) {
return SDL_FALSE; return SDL_FALSE;
} }
@ -2228,6 +2231,8 @@ SDL_DestroyWindow(SDL_Window * window)
CHECK_WINDOW_MAGIC(window, ); CHECK_WINDOW_MAGIC(window, );
window->is_destroying = SDL_TRUE;
/* Restore video mode, etc. */ /* Restore video mode, etc. */
SDL_HideWindow(window); SDL_HideWindow(window);