godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Input::set_custom_mouse_cursor showing cursor when it's invisible

Browse Source
This commit is contained in:
Guilherme Felipe 2018-09-17 12:24:44 -03:00
parent 6e62a1e4de
commit 72d4fd8f0d
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform/osx/os_osx.mm
View File

@ -1272,7 +1272,9 @@ void OS_OSX::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shape, c
cursors[p_shape] = cursor; cursors[p_shape] = cursor;
if (p_shape == CURSOR_ARROW) { if (p_shape == CURSOR_ARROW) {
[cursor set]; if (mouse_mode == MOUSE_MODE_VISIBLE) {
[cursor set];
}
} }
[imgrep release]; [imgrep release];

4
platform/windows/os_windows.cpp
View File

@ -2059,7 +2059,9 @@ void OS_Windows::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shap
cursors[p_shape] = CreateIconIndirect(&iconinfo); cursors[p_shape] = CreateIconIndirect(&iconinfo);
if (p_shape == CURSOR_ARROW) { if (p_shape == CURSOR_ARROW) {
SetCursor(cursors[p_shape]); if (mouse_mode == MOUSE_MODE_VISIBLE) {
SetCursor(cursors[p_shape]);
}
} }
if (hAndMask != NULL) { if (hAndMask != NULL) {

4
platform/x11/os_x11.cpp
View File

@ -2218,7 +2218,9 @@ void OS_X11::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shape, c
cursors[p_shape] = XcursorImageLoadCursor(x11_display, cursor_image); cursors[p_shape] = XcursorImageLoadCursor(x11_display, cursor_image);
if (p_shape == CURSOR_ARROW) { if (p_shape == CURSOR_ARROW) {
XDefineCursor(x11_display, x11_window, cursors[p_shape]); if (mouse_mode == MOUSE_MODE_VISIBLE) {
XDefineCursor(x11_display, x11_window, cursors[p_shape]);
}
} }
memfree(cursor_image->pixels); memfree(cursor_image->pixels);