diff options
author | Guilherme Felipe <guilhermefelipecgs@gmail.com> | 2018-04-08 21:59:51 -0300 |
---|---|---|
committer | Guilherme Felipe <guilhermefelipecgs@gmail.com> | 2018-04-09 10:28:20 -0300 |
commit | 62b835a2cdc1216753229ddb3ebd0fcdcc988eb9 (patch) | |
tree | a4f863394195b0d99f19951ffecd462a494e5e79 /platform/osx | |
parent | b67bfa3328baf8bbc4174a3facbceb1cccdea4ec (diff) |
Fix custom cursor when it's hidden
[Linux] Ensures that the custom cursor will be used when changing to
MOUSE_MODE_VISIBLE. Fix #3086
[Windows] Fix cursor flickering when MOUSE_MODE_HIDDEN.
[Mac] Fix possible cursor flicker when MOUSE_MODE_HIDDEN.
Diffstat (limited to 'platform/osx')
-rw-r--r-- | platform/osx/os_osx.mm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index 0c5524dd08..fbefd41bb7 100644 --- a/platform/osx/os_osx.mm +++ b/platform/osx/os_osx.mm @@ -1474,6 +1474,11 @@ void OS_OSX::set_cursor_shape(CursorShape p_shape) { if (cursor_shape == p_shape) return; + if (mouse_mode != MOUSE_MODE_VISIBLE) { + cursor_shape = p_shape; + return; + } + if (cursors[p_shape] != NULL) { [cursors[p_shape] set]; } else { |