godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-04 17:04:49 +00:00
Code Releases Wiki Activity

Merge pull request #46553 from Ev1lbl0w/bugfix-window_size_bug

Browse Source 
Prevent invalid values when resizing window (X11)
This commit is contained in:
Rémi Verschelde
2021-03-01 14:16:27 +01:00
committed by GitHub
parent 7e2e96c587 be4e34b495
commit f4df2cdeef
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
platform/x11/os_x11.cpp
View File

@@ -1421,15 +1421,19 @@ void OS_X11::set_window_size(const Size2 p_size) {
int old_w = xwa.width; int old_w = xwa.width;
int old_h = xwa.height; int old_h = xwa.height;
Size2 size = p_size;
size.x = MAX(1, size.x);
size.y = MAX(1, size.y);
// If window resizable is disabled we need to update the attributes first // If window resizable is disabled we need to update the attributes first
XSizeHints *xsh; XSizeHints *xsh;
xsh = XAllocSizeHints(); xsh = XAllocSizeHints();
if (!is_window_resizable()) { if (!is_window_resizable()) {
xsh->flags = PMinSize | PMaxSize; xsh->flags = PMinSize | PMaxSize;
xsh->min_width = p_size.x; xsh->min_width = size.x;
xsh->max_width = p_size.x; xsh->max_width = size.x;
xsh->min_height = p_size.y; xsh->min_height = size.y;
xsh->max_height = p_size.y; xsh->max_height = size.y;
} else { } else {
xsh->flags = 0L; xsh->flags = 0L;
if (min_size != Size2()) { if (min_size != Size2()) {
@@ -1447,11 +1451,11 @@ void OS_X11::set_window_size(const Size2 p_size) {
XFree(xsh); XFree(xsh);
// Resize the window // Resize the window
XResizeWindow(x11_display, x11_window, p_size.x, p_size.y); XResizeWindow(x11_display, x11_window, size.x, size.y);
// Update our videomode width and height // Update our videomode width and height
current_videomode.width = p_size.x; current_videomode.width = size.x;
current_videomode.height = p_size.y; current_videomode.height = size.y;
for (int timeout = 0; timeout < 50; ++timeout) { for (int timeout = 0; timeout < 50; ++timeout) {
XSync(x11_display, False); XSync(x11_display, False);