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

Fixed bug 3202 - Fix renderer visibility on a window maximized directly from the minimized state

Browse source 
Many thanks to id.zeta for details on the bug, and for the fix!

--HG--
extra : rebase_source : 9362e46110ea0930ab99f2935c5a4eac8ab723bd
This commit is contained in:
David Ludwig 2015-12-27 17:55:45 -05:00
parent 40abc16c30
commit 4a76370838
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/events/SDL_windowevents.c
View file

@ -127,6 +127,7 @@ SDL_SendWindowEvent(SDL_Window * window, Uint8 windowevent, int data1,
if (window->flags & SDL_WINDOW_MINIMIZED) { if (window->flags & SDL_WINDOW_MINIMIZED) {
return 0; return 0;
} }
window->flags &= ~SDL_WINDOW_MAXIMIZED;
window->flags |= SDL_WINDOW_MINIMIZED; window->flags |= SDL_WINDOW_MINIMIZED;
SDL_OnWindowMinimized(window); SDL_OnWindowMinimized(window);
break; break;
@ -134,6 +135,7 @@ SDL_SendWindowEvent(SDL_Window * window, Uint8 windowevent, int data1,
if (window->flags & SDL_WINDOW_MAXIMIZED) { if (window->flags & SDL_WINDOW_MAXIMIZED) {
return 0; return 0;
} }
window->flags &= ~SDL_WINDOW_MINIMIZED;
window->flags |= SDL_WINDOW_MAXIMIZED; window->flags |= SDL_WINDOW_MAXIMIZED;
break; break;
case SDL_WINDOWEVENT_RESTORED: case SDL_WINDOWEVENT_RESTORED:

3
src/render/SDL_render.c
View file

@ -158,7 +158,8 @@ SDL_RendererEventWatch(void *userdata, SDL_Event *event)
} }
} else if (event->window.event == SDL_WINDOWEVENT_MINIMIZED) { } else if (event->window.event == SDL_WINDOWEVENT_MINIMIZED) {
renderer->hidden = SDL_TRUE; renderer->hidden = SDL_TRUE;
} else if (event->window.event == SDL_WINDOWEVENT_RESTORED) { } else if (event->window.event == SDL_WINDOWEVENT_RESTORED ||
event->window.event == SDL_WINDOWEVENT_MAXIMIZED) {
if (!(SDL_GetWindowFlags(window) & SDL_WINDOW_HIDDEN)) { if (!(SDL_GetWindowFlags(window) & SDL_WINDOW_HIDDEN)) {
renderer->hidden = SDL_FALSE; renderer->hidden = SDL_FALSE;
} }