diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-27 10:29:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-27 10:29:03 +0100 |
| commit | 64470ef6395eb110c3cdd0757e2dfabd517d54de (patch) | |
| tree | 45a92db636baeec353d1995f74fd156509c2f804 /platform/osx/display_server_osx.h | |
| parent | 5f1107aa30295e686be6f41cb6d17fc2cff1e036 (diff) | |
| parent | e1c1bb03ea604f3ef15bcac0cd3aa330acb2f4a8 (diff) | |
Merge pull request #37339 from bruvzg/mac_disp_server_fixes
[macOS] Prevent recursive `_dispatch_input_event` calls, improve window focus regain.
Diffstat (limited to 'platform/osx/display_server_osx.h')
| -rw-r--r-- | platform/osx/display_server_osx.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/platform/osx/display_server_osx.h b/platform/osx/display_server_osx.h index d0e2babd06..33f483bd0e 100644 --- a/platform/osx/display_server_osx.h +++ b/platform/osx/display_server_osx.h @@ -148,6 +148,7 @@ public: void _push_input(const Ref<InputEvent> &p_event); void _process_key_events(); + void _release_pressed_events(); String rendering_driver; @@ -165,6 +166,7 @@ public: bool window_focused; bool drop_events; + bool in_dispatch_input_event = false; public: virtual bool has_feature(Feature p_feature) const; |