diff options
| author | Max Hilbrunner <mhilbrunner@users.noreply.github.com> | 2018-05-21 18:30:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-21 18:30:11 +0200 |
| commit | 0980991e6433a3f394a9ae99bec10cb04c8b77e0 (patch) | |
| tree | 1dbf29bc059f7b90d7569e2b8dcfe1c66a43eb7d /platform/osx | |
| parent | 3ac7f08b5585943b2f6e9e4868e366eb44cec368 (diff) | |
| parent | 28d24c4f6689a622f4451b354797038fc00543e9 (diff) | |
Merge pull request #19070 from guilhermefelipecgs/fix_19033
Fix mouse confined and set_borderless_window
Diffstat (limited to 'platform/osx')
| -rw-r--r-- | platform/osx/os_osx.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index cd20cc563b..b97ccc19a7 100644 --- a/platform/osx/os_osx.mm +++ b/platform/osx/os_osx.mm @@ -1480,7 +1480,7 @@ void OS_OSX::set_cursor_shape(CursorShape p_shape) { if (cursor_shape == p_shape) return; - if (mouse_mode != MOUSE_MODE_VISIBLE) { + if (mouse_mode != MOUSE_MODE_VISIBLE && mouse_mode != MOUSE_MODE_CONFINED) { cursor_shape = p_shape; return; } |