asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7683 from marcelofg55/master

Browse source 
Fix issues with set_window_resizable on x11
This commit is contained in:
Rémi Verschelde 2017-02-02 08:17:14 +01:00 committed by GitHub
commit 869d710198
1 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
platform/x11/os_x11.cpp
View file

@ -775,13 +775,31 @@ void OS_X11::set_window_position(const Point2& p_position) {
} }
Size2 OS_X11::get_window_size() const { Size2 OS_X11::get_window_size() const {
XWindowAttributes xwa; // Use current_videomode width and height instead of XGetWindowAttributes
XGetWindowAttributes(x11_display, x11_window, &xwa); // since right after a XResizeWindow the attributes may not be updated yet
return Size2i(xwa.width, xwa.height); return Size2i(current_videomode.width, current_videomode.height);
} }
void OS_X11::set_window_size(const Size2 p_size) { void OS_X11::set_window_size(const Size2 p_size) {
// If window resizable is disabled we need to update the attributes first
if (is_window_resizable() == false) {
XSizeHints *xsh;
xsh = XAllocSizeHints();
xsh->flags = PMinSize | PMaxSize;
xsh->min_width = p_size.x;
xsh->max_width = p_size.x;
xsh->min_height = p_size.y;
xsh->max_height = p_size.y;
XSetWMNormalHints(x11_display, x11_window, xsh);
XFree(xsh);
}
// Resize the window
XResizeWindow(x11_display, x11_window, p_size.x, p_size.y); XResizeWindow(x11_display, x11_window, p_size.x, p_size.y);
// Update our videomode width and height
current_videomode.width = p_size.x;
current_videomode.height = p_size.y;
} }
void OS_X11::set_window_fullscreen(bool p_enabled) { void OS_X11::set_window_fullscreen(bool p_enabled) {
@ -795,15 +813,15 @@ bool OS_X11::is_window_fullscreen() const {
void OS_X11::set_window_resizable(bool p_enabled) { void OS_X11::set_window_resizable(bool p_enabled) {
XSizeHints *xsh; XSizeHints *xsh;
Size2 size = get_window_size();
xsh = XAllocSizeHints(); xsh = XAllocSizeHints();
xsh->flags = p_enabled ? 0L : PMinSize | PMaxSize; xsh->flags = p_enabled ? 0L : PMinSize | PMaxSize;
if(!p_enabled) { if(!p_enabled) {
XWindowAttributes xwa; xsh->min_width = size.x;
XGetWindowAttributes(x11_display,x11_window,&xwa); xsh->max_width = size.x;
xsh->min_width = xwa.width; xsh->min_height = size.y;
xsh->max_width = xwa.width; xsh->max_height = size.y;
xsh->min_height = xwa.height;
xsh->max_height = xwa.height;
} }
XSetWMNormalHints(x11_display, x11_window, xsh); XSetWMNormalHints(x11_display, x11_window, xsh);
XFree(xsh); XFree(xsh);