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

Fix the size to the windowed mode, not the fullscreen mode.

Browse source
This commit is contained in:
Sam Lantinga 2012-10-03 12:19:55 -07:00
parent b19b82aa44
commit 39f2156ead
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/video/x11/SDL_x11window.c
View file

@ -79,6 +79,7 @@ X11_IsWindowMapped(_THIS, SDL_Window * window)
}
}
#if 0
static SDL_bool
X11_IsActionAllowed(SDL_Window *window, Atom action)
{
@ -105,6 +106,7 @@ X11_IsActionAllowed(SDL_Window *window, Atom action)
}
return ret;
}
#endif /* 0 */
void
X11_SetNetWMState(_THIS, Window xwindow, Uint32 flags)
@ -912,7 +914,6 @@ X11_SetWindowFullscreenViaWM(_THIS, SDL_Window * window, SDL_VideoDisplay * _dis
Display *display = data->videodata->display;
Atom _NET_WM_STATE = data->videodata->_NET_WM_STATE;
Atom _NET_WM_STATE_FULLSCREEN = data->videodata->_NET_WM_STATE_FULLSCREEN;
Atom _NET_WM_ACTION_FULLSCREEN = data->videodata->_NET_WM_ACTION_FULLSCREEN;
if (X11_IsWindowMapped(_this, window)) {
XEvent e;
@ -930,8 +931,8 @@ X11_SetWindowFullscreenViaWM(_THIS, SDL_Window * window, SDL_VideoDisplay * _dis
} else {
/* Reset the min/max width height to make the window non-resizable again */
sizehints->flags |= PMinSize | PMaxSize;
sizehints->min_width = sizehints->max_width = window->w;
sizehints->min_height = sizehints->max_height = window->h;
sizehints->min_width = sizehints->max_width = window->windowed.w;
sizehints->min_height = sizehints->max_height = window->windowed.h;
}
XSetWMNormalHints(display, data->xwindow, sizehints);
XFree(sizehints);