summaryrefslogtreecommitdiff
path: root/platform/macos/display_server_macos.h
diff options
context:
space:
mode:
authorbruvzg <7645683+bruvzg@users.noreply.github.com>2022-09-24 23:57:00 +0300
committerbruvzg <7645683+bruvzg@users.noreply.github.com>2022-09-24 23:57:24 +0300
commitb66931946b0adb90e5539da8e54dfbeb02b33c4f (patch)
tree22abaf207b19bf0c9f93558e7f2983e1be8424b1 /platform/macos/display_server_macos.h
parentf74491fdee9bc2d68668137fbacd8f3a7e7e8df7 (diff)
[macOS] Process menu callback after event processing step to avoid event queue corruption.
Diffstat (limited to 'platform/macos/display_server_macos.h')
-rw-r--r--platform/macos/display_server_macos.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/platform/macos/display_server_macos.h b/platform/macos/display_server_macos.h
index a27e0d5efa..e72273a681 100644
--- a/platform/macos/display_server_macos.h
+++ b/platform/macos/display_server_macos.h
@@ -179,6 +179,12 @@ private:
IOPMAssertionID screen_keep_on_assertion = kIOPMNullAssertionID;
+ struct MenuCall {
+ Variant tag;
+ Callable callback;
+ };
+ Vector<MenuCall> deferred_menu_calls;
+
const NSMenu *_get_menu_root(const String &p_menu_root) const;
NSMenu *_get_menu_root(const String &p_menu_root);