diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2024-03-16 13:12:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-16 13:12:53 +0100 |
| commit | fe01776f05b1787b28b4a270d53037a3c25f4ca2 (patch) | |
| tree | ec1b40606a343dfadf16ff08ae09d199df80c9e1 /editor | |
| parent | 68ad520da4365c866ceea42e0238b2ea24647289 (diff) | |
| parent | ebb19c419804621bf2e5e08a0a77fb1d22eb1a6b (diff) | |
| download | redot-engine-fe01776f05b1787b28b4a270d53037a3c25f4ca2.tar.gz | |
Merge pull request #89540 from bruvzg/menu_fix_string_read
[NativeMenu] Fix changes lost due to incorrect rebase (menu goes under task bar, dark mode, item text get, docs) and check to ensure help menu is not using native menu on Windows.
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/editor_node.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 3abf0582bc..c2490a4365 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -6754,7 +6754,7 @@ EditorNode::EditorNode() { ED_SHORTCUT_AND_COMMAND("editor/editor_settings", TTR("Editor Settings...")); ED_SHORTCUT_OVERRIDE("editor/editor_settings", "macos", KeyModifierMask::META + Key::COMMA); #ifdef MACOS_ENABLED - if (global_menu) { + if (global_menu && NativeMenu::get_singleton()->has_system_menu(NativeMenu::APPLICATION_MENU_ID)) { apple_menu = memnew(PopupMenu); apple_menu->set_system_menu(NativeMenu::APPLICATION_MENU_ID); main_menu->add_child(apple_menu); @@ -6879,7 +6879,9 @@ EditorNode::EditorNode() { help_menu = memnew(PopupMenu); help_menu->set_name(TTR("Help")); - help_menu->set_system_menu(NativeMenu::HELP_MENU_ID); + if (global_menu && NativeMenu::get_singleton()->has_system_menu(NativeMenu::HELP_MENU_ID)) { + help_menu->set_system_menu(NativeMenu::HELP_MENU_ID); + } main_menu->add_child(help_menu); help_menu->connect("id_pressed", callable_mp(this, &EditorNode::_menu_option)); |