Leahnaya/SDL
1
0
Fork 0
mirror of https://github.com/yawut/SDL.git synced 2026-08-24 01:35:39 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

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 96db7a048d
commit 44c3a8a110
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_FULLSCREEN);
GET_ATOM(_NET_WM_ALLOWED_ACTIONS);
GET_ATOM(_NET_WM_ACTION_RESIZE);
GET_ATOM(_NET_WM_ACTION_FULLSCREEN);
GET_ATOM(_NET_WM_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_FULLSCREEN;
Atom _NET_WM_ALLOWED_ACTIONS;
Atom _NET_WM_ACTION_RESIZE;
Atom _NET_WM_ACTION_FULLSCREEN;
Atom _NET_WM_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_HORZ = videodata->_NET_WM_STATE_MAXIMIZED_HORZ;
Atom _NET_WM_STATE_FULLSCREEN = videodata->_NET_WM_STATE_FULLSCREEN;
Atom _NET_WM_ACTION_RESIZE = videodata->_NET_WM_ACTION_RESIZE;
Atom actualType;
int actualFormat;
unsigned long i, numItems, bytesAfter;
@@ -189,9 +188,8 @@ X11_GetNetWMState(_THIS, SDL_Window * window)
XFree(propertyValue);
}
if (X11_IsActionAllowed(window, _NET_WM_ACTION_RESIZE)) {
flags |= SDL_WINDOW_RESIZABLE;
}
/* FIXME, check the size hints for resizable */
/*flags |= SDL_WINDOW_RESIZABLE;*/
return flags;
}