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.
authorSam Lantinga <slouken@libsdl.org>
Fri, 28 Sep 2012 01:11:30 -0700
changeset 6484b904bb684095
parent 6483 4b51ff3dcf74
child 6485 3f600ccf393c
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.
src/video/x11/SDL_x11video.c
src/video/x11/SDL_x11video.h
src/video/x11/SDL_x11window.c
     1.1 --- a/src/video/x11/SDL_x11video.c	Fri Sep 28 00:57:47 2012 -0700
     1.2 +++ b/src/video/x11/SDL_x11video.c	Fri Sep 28 01:11:30 2012 -0700
     1.3 @@ -341,7 +341,6 @@
     1.4      GET_ATOM(_NET_WM_STATE_MAXIMIZED_HORZ);
     1.5      GET_ATOM(_NET_WM_STATE_FULLSCREEN);
     1.6      GET_ATOM(_NET_WM_ALLOWED_ACTIONS);
     1.7 -    GET_ATOM(_NET_WM_ACTION_RESIZE);
     1.8      GET_ATOM(_NET_WM_ACTION_FULLSCREEN);
     1.9      GET_ATOM(_NET_WM_NAME);
    1.10      GET_ATOM(_NET_WM_ICON_NAME);
     2.1 --- a/src/video/x11/SDL_x11video.h	Fri Sep 28 00:57:47 2012 -0700
     2.2 +++ b/src/video/x11/SDL_x11video.h	Fri Sep 28 01:11:30 2012 -0700
     2.3 @@ -88,7 +88,6 @@
     2.4      Atom _NET_WM_STATE_MAXIMIZED_HORZ;
     2.5      Atom _NET_WM_STATE_FULLSCREEN;
     2.6      Atom _NET_WM_ALLOWED_ACTIONS;
     2.7 -    Atom _NET_WM_ACTION_RESIZE;
     2.8      Atom _NET_WM_ACTION_FULLSCREEN;
     2.9      Atom _NET_WM_NAME;
    2.10      Atom _NET_WM_ICON_NAME;
     3.1 --- a/src/video/x11/SDL_x11window.c	Fri Sep 28 00:57:47 2012 -0700
     3.2 +++ b/src/video/x11/SDL_x11window.c	Fri Sep 28 01:11:30 2012 -0700
     3.3 @@ -152,7 +152,6 @@
     3.4      Atom _NET_WM_STATE_MAXIMIZED_VERT = videodata->_NET_WM_STATE_MAXIMIZED_VERT;
     3.5      Atom _NET_WM_STATE_MAXIMIZED_HORZ = videodata->_NET_WM_STATE_MAXIMIZED_HORZ;
     3.6      Atom _NET_WM_STATE_FULLSCREEN = videodata->_NET_WM_STATE_FULLSCREEN;
     3.7 -    Atom _NET_WM_ACTION_RESIZE = videodata->_NET_WM_ACTION_RESIZE;
     3.8      Atom actualType;
     3.9      int actualFormat;
    3.10      unsigned long i, numItems, bytesAfter;
    3.11 @@ -189,9 +188,8 @@
    3.12          XFree(propertyValue);
    3.13      }
    3.14  
    3.15 -    if (X11_IsActionAllowed(window, _NET_WM_ACTION_RESIZE)) {
    3.16 -        flags |= SDL_WINDOW_RESIZABLE;
    3.17 -    }
    3.18 +    /* FIXME, check the size hints for resizable */
    3.19 +    /*flags |= SDL_WINDOW_RESIZABLE;*/
    3.20  
    3.21      return flags;
    3.22  }