summaryrefslogtreecommitdiff
path: root/platform/x11
diff options
context:
space:
mode:
authorGuilherme Felipe <guilhermefelipecgs@gmail.com>2018-05-20 19:07:25 -0300
committerGuilherme Felipe <guilhermefelipecgs@gmail.com>2018-05-20 20:53:04 -0300
commit28d24c4f6689a622f4451b354797038fc00543e9 (patch)
tree1c296627f141a08491f726f8bad9c6b246a19312 /platform/x11
parent228b09bafbad467389dd851699df1a327fbdea21 (diff)
Fix #19033
- Fix a bug when mouse is confined don't update the cursor shape. - Don't let the mouse leave the window when resizing to a smaller resolution when MOUSE_MODE_CONFINED. - Fix set_borderless_window to preserve the actual video_mode.widht/height.
Diffstat (limited to 'platform/x11')
-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 eec371865e..50cc209dca 100644
--- a/platform/x11/os_x11.cpp
+++ b/platform/x11/os_x11.cpp
@@ -2407,7 +2407,7 @@ void OS_X11::set_cursor_shape(CursorShape p_shape) {
if (p_shape == current_cursor)
return;
- if (mouse_mode == MOUSE_MODE_VISIBLE) {
+ if (mouse_mode == MOUSE_MODE_VISIBLE && mouse_mode != MOUSE_MODE_CONFINED) {
if (cursors[p_shape] != None)
XDefineCursor(x11_display, x11_window, cursors[p_shape]);
else if (cursors[CURSOR_ARROW] != None)