pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

A window being fullscreen takes precedence over coordinate checks

Browse source 
This fixes restoring video mode on the second display at shutdown in some circumstances.
This commit is contained in:
Sam Lantinga 2012-10-03 18:54:31 -07:00
parent 616ca3c4af
commit 02dd74ba7e
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/video/SDL_video.c
View file

@ -933,13 +933,20 @@ SDL_GetWindowDisplay(SDL_Window * window)
}
/* Find the display containing the window */
for (i = 0; i < _this->num_displays; ++i) {
SDL_VideoDisplay *display = &_this->displays[i];
if (display->fullscreen_window == window) {
return i;
}
}
center.x = window->x + window->w / 2;
center.y = window->y + window->h / 2;
for (i = 0; i < _this->num_displays; ++i) {
SDL_VideoDisplay *display = &_this->displays[i];
SDL_GetDisplayBounds(i, &rect);
if (display->fullscreen_window == window || SDL_EnclosePoints(&center, 1, &rect, NULL)) {
if (SDL_EnclosePoints(&center, 1, &rect, NULL)) {
return i;
}