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

Don't base our resizable state on what the window manager decided, instead we want to base it on the size hints which we set.

Browse source
This commit is contained in:
Sam Lantinga 2012-09-28 01:11:30 -07:00
parent 6380cc6759
commit 71450f7c85
3 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/video/x11/SDL_x11video.c
View file

@ -341,7 +341,6 @@ X11_VideoInit(_THIS)
GET_ATOM(_NET_WM_STATE_MAXIMIZED_HORZ); GET_ATOM(_NET_WM_STATE_MAXIMIZED_HORZ);
GET_ATOM(_NET_WM_STATE_FULLSCREEN); GET_ATOM(_NET_WM_STATE_FULLSCREEN);
GET_ATOM(_NET_WM_ALLOWED_ACTIONS); GET_ATOM(_NET_WM_ALLOWED_ACTIONS);
GET_ATOM(_NET_WM_ACTION_RESIZE);
GET_ATOM(_NET_WM_ACTION_FULLSCREEN); GET_ATOM(_NET_WM_ACTION_FULLSCREEN);
GET_ATOM(_NET_WM_NAME); GET_ATOM(_NET_WM_NAME);
GET_ATOM(_NET_WM_ICON_NAME); GET_ATOM(_NET_WM_ICON_NAME);

1
src/video/x11/SDL_x11video.h
View file

@ -88,7 +88,6 @@ typedef struct SDL_VideoData
Atom _NET_WM_STATE_MAXIMIZED_HORZ; Atom _NET_WM_STATE_MAXIMIZED_HORZ;
Atom _NET_WM_STATE_FULLSCREEN; Atom _NET_WM_STATE_FULLSCREEN;
Atom _NET_WM_ALLOWED_ACTIONS; Atom _NET_WM_ALLOWED_ACTIONS;
Atom _NET_WM_ACTION_RESIZE;
Atom _NET_WM_ACTION_FULLSCREEN; Atom _NET_WM_ACTION_FULLSCREEN;
Atom _NET_WM_NAME; Atom _NET_WM_NAME;
Atom _NET_WM_ICON_NAME; Atom _NET_WM_ICON_NAME;

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

@ -152,7 +152,6 @@ X11_GetNetWMState(_THIS, SDL_Window * window)
Atom _NET_WM_STATE_MAXIMIZED_VERT = videodata->_NET_WM_STATE_MAXIMIZED_VERT; Atom _NET_WM_STATE_MAXIMIZED_VERT = videodata->_NET_WM_STATE_MAXIMIZED_VERT;
Atom _NET_WM_STATE_MAXIMIZED_HORZ = videodata->_NET_WM_STATE_MAXIMIZED_HORZ; Atom _NET_WM_STATE_MAXIMIZED_HORZ = videodata->_NET_WM_STATE_MAXIMIZED_HORZ;
Atom _NET_WM_STATE_FULLSCREEN = videodata->_NET_WM_STATE_FULLSCREEN; Atom _NET_WM_STATE_FULLSCREEN = videodata->_NET_WM_STATE_FULLSCREEN;
Atom _NET_WM_ACTION_RESIZE = videodata->_NET_WM_ACTION_RESIZE;
Atom actualType; Atom actualType;
int actualFormat; int actualFormat;
unsigned long i, numItems, bytesAfter; unsigned long i, numItems, bytesAfter;
@ -189,9 +188,8 @@ X11_GetNetWMState(_THIS, SDL_Window * window)
XFree(propertyValue); XFree(propertyValue);
} }
if (X11_IsActionAllowed(window, _NET_WM_ACTION_RESIZE)) { /* FIXME, check the size hints for resizable */
flags |= SDL_WINDOW_RESIZABLE; /*flags |= SDL_WINDOW_RESIZABLE;*/
}
return flags; return flags;
} }