summaryrefslogtreecommitdiff
path: root/platform/x11/os_x11.cpp
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2018-11-20 08:48:41 +0100
committerGitHub <noreply@github.com>2018-11-20 08:48:41 +0100
commit9c55d6842b0b9ebb51e40822539997528122a700 (patch)
tree721d117adf3ea93b195076bb7f6c14da7bd3d1ff /platform/x11/os_x11.cpp
parent99a4274f513ef1de6417d54bac366521e0654107 (diff)
parent385832ed302c51882951c7b36f21caf6b8125565 (diff)
Merge pull request #23815 from marcelofg55/x11_fs_fix
Fix X11 running a project with fullscreen setting on and resizable off with multiple screens
Diffstat (limited to 'platform/x11/os_x11.cpp')
-rw-r--r--platform/x11/os_x11.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp
index 2ab7b835b6..04854e93b6 100644
--- a/platform/x11/os_x11.cpp
+++ b/platform/x11/os_x11.cpp
@@ -369,7 +369,7 @@ Error OS_X11::initialize(const VideoMode &p_desired, int p_video_driver, int p_a
}
// disable resizable window
- if (!current_videomode.resizable) {
+ if (!current_videomode.resizable && !current_videomode.fullscreen) {
XSizeHints *xsh;
xsh = XAllocSizeHints();
xsh->flags = PMinSize | PMaxSize;