diff options
Diffstat (limited to 'platform/osx/display_server_osx.h')
| -rw-r--r-- | platform/osx/display_server_osx.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/platform/osx/display_server_osx.h b/platform/osx/display_server_osx.h index d0e2babd06..8133dfe2c4 100644 --- a/platform/osx/display_server_osx.h +++ b/platform/osx/display_server_osx.h @@ -33,7 +33,7 @@ #define BitMap _QDBitMap // Suppress deprecated QuickDraw definition. -#include "core/input/input_filter.h" +#include "core/input/input.h" #include "servers/display_server.h" #if defined(OPENGL_ENABLED) @@ -71,8 +71,8 @@ public: const NSMenu *_get_menu_root(const String &p_menu_root) const; NSMenu *_get_menu_root(const String &p_menu_root); - NSMenu *apple_menu = NULL; - NSMenu *dock_menu = NULL; + NSMenu *apple_menu = nullptr; + NSMenu *dock_menu = nullptr; Map<String, NSMenu *> submenu; struct KeyEvent { @@ -95,7 +95,7 @@ public: id window_view; #if defined(OPENGL_ENABLED) - ContextGL_OSX *context_gles2 = NULL; + ContextGL_OSX *context_gles2 = nullptr; #endif Point2i mouse_pos; @@ -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; |