You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-08 12:40:44 +00:00
[macOS] Fix embedded menu/spacer relative position.
This commit is contained in:
@@ -7401,13 +7401,13 @@ void EditorNode::_update_main_menu_type() {
|
|||||||
menu_btn_spacer = memnew(Control);
|
menu_btn_spacer = memnew(Control);
|
||||||
menu_btn_spacer->set_custom_minimum_size(Vector2(8, 0) * EDSCALE);
|
menu_btn_spacer->set_custom_minimum_size(Vector2(8, 0) * EDSCALE);
|
||||||
title_bar->add_child(menu_btn_spacer);
|
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
|
#endif
|
||||||
title_bar->add_child(main_menu_button);
|
title_bar->add_child(main_menu_button);
|
||||||
if (menu_btn_spacer == nullptr) {
|
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 {
|
} 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);
|
memdelete_notnull(main_menu_bar);
|
||||||
main_menu_bar = nullptr;
|
main_menu_bar = nullptr;
|
||||||
@@ -7442,7 +7442,7 @@ void EditorNode::_update_main_menu_type() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
title_bar->add_child(main_menu_bar);
|
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(menu_btn_spacer);
|
||||||
memdelete_notnull(main_menu_button);
|
memdelete_notnull(main_menu_button);
|
||||||
|
|||||||
Reference in New Issue
Block a user