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

[Windows] Prevent overwriting old cursor handle on multiple mouse_mode changes, ensure mouse_mode is set before `cursor_set_shape` is called to restore cursor.

This commit is contained in:
bruvzg 2020-06-22 13:05:18 +03:00
parent 6869d5d190
commit fc1d1c3557
No known key found for this signature in database
GPG Key ID: FCED35F1CECE0D3A
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
platform/windows/display_server_windows.cpp
View File

@ -103,7 +103,11 @@ void DisplayServerWindows::_set_mouse_mode_impl(MouseMode p_mode) {
} }
if (p_mode == MOUSE_MODE_CAPTURED || p_mode == MOUSE_MODE_HIDDEN) { if (p_mode == MOUSE_MODE_CAPTURED || p_mode == MOUSE_MODE_HIDDEN) {
hCursor = SetCursor(nullptr); if (hCursor == nullptr) {
hCursor = SetCursor(nullptr);
} else {
SetCursor(nullptr);
}
} else { } else {
CursorShape c = cursor_shape; CursorShape c = cursor_shape;
cursor_shape = CURSOR_MAX; cursor_shape = CURSOR_MAX;
@ -117,9 +121,9 @@ void DisplayServerWindows::mouse_set_mode(MouseMode p_mode) {
if (mouse_mode == p_mode) if (mouse_mode == p_mode)
return; return;
_set_mouse_mode_impl(p_mode);
mouse_mode = p_mode; mouse_mode = p_mode;
_set_mouse_mode_impl(p_mode);
} }
DisplayServer::MouseMode DisplayServerWindows::mouse_get_mode() const { DisplayServer::MouseMode DisplayServerWindows::mouse_get_mode() const {
@ -2654,10 +2658,11 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
if (LOWORD(lParam) == HTCLIENT) { if (LOWORD(lParam) == HTCLIENT) {
if (windows[window_id].window_has_focus && (mouse_mode == MOUSE_MODE_HIDDEN || mouse_mode == MOUSE_MODE_CAPTURED)) { if (windows[window_id].window_has_focus && (mouse_mode == MOUSE_MODE_HIDDEN || mouse_mode == MOUSE_MODE_CAPTURED)) {
//Hide the cursor //Hide the cursor
if (hCursor == nullptr) if (hCursor == nullptr) {
hCursor = SetCursor(nullptr); hCursor = SetCursor(nullptr);
else } else {
SetCursor(nullptr); SetCursor(nullptr);
}
} else { } else {
if (hCursor != nullptr) { if (hCursor != nullptr) {
CursorShape c = cursor_shape; CursorShape c = cursor_shape;