Don't base our resizable state on what the window manager decided, in…

…stead we want to base it on the size hints which we set.
libsdl-org · Sep 28, 2012 · 7a6bb74 · 7a6bb74
1 parent 77b81c1
commit 7a6bb74
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/src/video/x11/SDL_x11video.c b/src/video/x11/SDL_x11video.c
@@ -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);

diff --git a/src/video/x11/SDL_x11video.h b/src/video/x11/SDL_x11video.h
@@ -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;

diff --git a/src/video/x11/SDL_x11window.c b/src/video/x11/SDL_x11window.c
@@ -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;
 }