summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2016-10-22 13:08:18 +0200
committerGitHub <noreply@github.com>2016-10-22 13:08:18 +0200
commit7740b3912c215f8930eb754fc9f76c490cc907d2 (patch)
tree6507921cc27b4de541402829f6d827f46aa9c778
parentad07b3135314ccb34a3322a7ef305216418b05ac (diff)
parent414d58e6c0ab8d3a75206127fac8e2b80cc67f29 (diff)
Merge pull request #6882 from vnen/mouse-mode
Fix the hiding of mouse cursor before interaction
-rw-r--r--platform/windows/os_windows.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp
index 38e738a414..286f5fb0b7 100644
--- a/platform/windows/os_windows.cpp
+++ b/platform/windows/os_windows.cpp
@@ -1366,13 +1366,16 @@ void OS_Windows::set_mouse_mode(MouseMode p_mode) {
POINT pos = { (int) center.x, (int) center.y };
ClientToScreen(hWnd, &pos);
SetCursorPos(pos.x, pos.y);
- ShowCursor(false);
} else {
- ShowCursor(true);
ReleaseCapture();
ClipCursor(NULL);
}
+ if (p_mode == MOUSE_MODE_CAPTURED || p_mode == MOUSE_MODE_HIDDEN) {
+ hCursor = SetCursor(NULL);
+ } else {
+ SetCursor(hCursor);
+ }
}
OS_Windows::MouseMode OS_Windows::get_mouse_mode() const{