diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-09-15 11:56:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-15 11:56:45 +0200 |
| commit | 82e69f38eeb4a41f74527248bf257ba50d375870 (patch) | |
| tree | 71f8171f21b47609a9ad9b4e8a7a8850b16f85d7 /platform/x11/os_x11.cpp | |
| parent | 4547e223933d1c1b24a526b3d632a2f96cdd6c8b (diff) | |
| parent | 04aef23585376c3e648c086e39a58e7f5fd41f7d (diff) | |
Merge pull request #21973 from guilhermefelipecgs/fix_default_cursor_shape
Some fixes to mouse's cursor and shape
Diffstat (limited to 'platform/x11/os_x11.cpp')
| -rw-r--r-- | platform/x11/os_x11.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index b80a20ce40..24dfe541f9 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -2606,7 +2606,7 @@ void OS_X11::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shape, c // Save it for a further usage cursors[p_shape] = XcursorImageLoadCursor(x11_display, cursor_image); - if (p_shape == CURSOR_ARROW) { + if (p_shape == current_cursor) { XDefineCursor(x11_display, x11_window, cursors[p_shape]); } @@ -2618,8 +2618,9 @@ void OS_X11::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shape, c cursors[p_shape] = XcursorImageLoadCursor(x11_display, img[p_shape]); } + CursorShape c = current_cursor; current_cursor = CURSOR_MAX; - set_cursor_shape(p_shape); + set_cursor_shape(c); } } |