godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #74511 from AThousandShips/win_cursor_fix 

Fix clearing custom cursor
This commit is contained in:
Rémi Verschelde 2023-06-20 00:00:57 +02:00
parent 764193629f a419325753
commit 356a602186
No known key found for this signature in database
GPG Key ID: C3336907360768E1
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform/linuxbsd/x11/display_server_x11.cpp
View File

@ -2856,11 +2856,11 @@ void DisplayServerX11::cursor_set_custom_image(const Ref<Resource> &p_cursor, Cu
cursors[p_shape] = XcursorImageLoadCursor(x11_display, cursor_img[p_shape]);
}
cursors_cache.erase(p_shape);
CursorShape c = current_cursor;
current_cursor = CURSOR_MAX;
cursor_set_shape(c);
cursors_cache.erase(p_shape);
}
}

4
platform/macos/display_server_macos.mm
View File

@ -3415,9 +3415,9 @@ void DisplayServerMacOS::cursor_set_custom_image(const Ref<Resource> &p_cursor,
cursors[p_shape] = nullptr;
}
cursor_update_shape();
cursors_cache.erase(p_shape);
cursor_update_shape();
}
}

4
platform/windows/display_server_windows.cpp
View File

@ -1907,11 +1907,11 @@ void DisplayServerWindows::cursor_set_custom_image(const Ref<Resource> &p_cursor
}
cursors[p_shape] = nullptr;
cursors_cache.erase(p_shape);
CursorShape c = cursor_shape;
cursor_shape = CURSOR_MAX;
cursor_set_shape(c);
cursors_cache.erase(p_shape);
}
}