summaryrefslogtreecommitdiff
path: root/platform/windows
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2018-09-17 17:55:25 +0200
committerGitHub <noreply@github.com>2018-09-17 17:55:25 +0200
commitede5f696b6e62acaad3b1cf57934b2027dec2b79 (patch)
tree4311ffbbf20b9e0a76ab23fe249d5291e6133b19 /platform/windows
parentebd14a778d29e0de4904564a762358cbc2412303 (diff)
parent360204e532345999f4d986cc77194c20d53a8cae (diff)
Merge pull request #22188 from guilhermefelipecgs/fix_20177_latest
Fix Input::set_custom_mouse_cursor showing cursor when it's invisible
Diffstat (limited to 'platform/windows')
-rw-r--r--platform/windows/os_windows.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp
index f63aebbbd3..d575525f93 100644
--- a/platform/windows/os_windows.cpp
+++ b/platform/windows/os_windows.cpp
@@ -2312,7 +2312,9 @@ void OS_Windows::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shap
cursors[p_shape] = CreateIconIndirect(&iconinfo);
if (p_shape == cursor_shape) {
- SetCursor(cursors[p_shape]);
+ if (mouse_mode == MOUSE_MODE_VISIBLE || mouse_mode == MOUSE_MODE_CONFINED) {
+ SetCursor(cursors[p_shape]);
+ }
}
if (hAndMask != NULL) {