Andrew/redot-engine
1
0
Fork 0
mirror of https://github.com/Redot-Engine/redot-engine.git synced 2025-12-06 15:21:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit godotengine/godot@4ebf67c

Browse Source
This commit is contained in:
Arctis-Fireblight
2025-08-27 23:18:33 -05:00
parent 50ed0e4bd2 4ebf67c12d
commit 00692349f5
177 changed files with 1631 additions and 967 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
editor/editor_node.cpp
View File

@@ -7411,13 +7411,13 @@ void EditorNode::_update_main_menu_type() {
menu_btn_spacer = memnew(Control);
menu_btn_spacer->set_custom_minimum_size(Vector2(8, 0) * EDSCALE);
title_bar->add_child(menu_btn_spacer);
title_bar->move_child(menu_btn_spacer, 0);
title_bar->move_child(menu_btn_spacer, left_menu_spacer ? left_menu_spacer->get_index() + 1 : 0);
#endif
title_bar->add_child(main_menu_button);
if (menu_btn_spacer == nullptr) {
title_bar->move_child(main_menu_button, 0);
title_bar->move_child(main_menu_button, left_menu_spacer ? left_menu_spacer->get_index() + 1 : 0);
} else {
title_bar->move_child(main_menu_button, 1);
title_bar->move_child(main_menu_button, menu_btn_spacer->get_index() + 1);
}
memdelete_notnull(main_menu_bar);
main_menu_bar = nullptr;
@@ -7452,7 +7452,7 @@ void EditorNode::_update_main_menu_type() {
}
title_bar->add_child(main_menu_bar);
title_bar->move_child(main_menu_bar, 0);
title_bar->move_child(main_menu_bar, left_menu_spacer ? left_menu_spacer->get_index() + 1 : 0);
memdelete_notnull(menu_btn_spacer);
memdelete_notnull(main_menu_button);