diff options
| author | Max Hilbrunner <mhilbrunner@users.noreply.github.com> | 2018-05-21 18:30:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-21 18:30:11 +0200 |
| commit | 0980991e6433a3f394a9ae99bec10cb04c8b77e0 (patch) | |
| tree | 1dbf29bc059f7b90d7569e2b8dcfe1c66a43eb7d /platform/x11/os_x11.cpp | |
| parent | 3ac7f08b5585943b2f6e9e4868e366eb44cec368 (diff) | |
| parent | 28d24c4f6689a622f4451b354797038fc00543e9 (diff) | |
| download | redot-engine-0980991e6433a3f394a9ae99bec10cb04c8b77e0.tar.gz | |
Merge pull request #19070 from guilhermefelipecgs/fix_19033
Fix mouse confined and set_borderless_window
Diffstat (limited to 'platform/x11/os_x11.cpp')
| -rw-r--r-- | platform/x11/os_x11.cpp | 2 |
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) |