Merge pull request #49848 from bruvzg/ccur_macos_fix

[macOS] Fix custom mouse cursor not set after mouse mode change.
This commit is contained in:
Rémi Verschelde 2021-06-23 10:56:28 +02:00 committed by GitHub
commit 659178e85f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2120,6 +2120,12 @@ void DisplayServerOSX::mouse_set_mode(MouseMode p_mode) {
ignore_warp = true;
warp_events.clear();
mouse_mode = p_mode;
if (mouse_mode == MOUSE_MODE_VISIBLE || mouse_mode == MOUSE_MODE_CONFINED) {
CursorShape p_shape = cursor_shape;
cursor_shape = DisplayServer::CURSOR_MAX;
cursor_set_shape(p_shape);
}
}
DisplayServer::MouseMode DisplayServerOSX::mouse_get_mode() const {