mirror of
https://github.com/godotengine/godot.git
synced 2026-01-01 05:49:28 +03:00
Merge pull request #113612 from BrotherShort/fix-center-buttons-offset
Fix center buttons offset
This commit is contained in:
@@ -7777,13 +7777,6 @@ void EditorNode::_update_main_menu_type() {
|
||||
}
|
||||
memdelete_notnull(main_menu_bar);
|
||||
main_menu_bar = nullptr;
|
||||
|
||||
if (project_run_bar != nullptr) {
|
||||
// Adjust spacers to center 2D / 3D / Script buttons.
|
||||
int max_w = MAX(project_run_bar->get_minimum_size().x + right_menu_hb->get_minimum_size().x, main_menu_button->get_minimum_size().x);
|
||||
left_spacer->set_custom_minimum_size(Size2(MAX(0, max_w - main_menu_button->get_minimum_size().x), 0));
|
||||
right_spacer->set_custom_minimum_size(Size2(MAX(0, max_w - project_run_bar->get_minimum_size().x - right_menu_hb->get_minimum_size().x), 0));
|
||||
}
|
||||
} else {
|
||||
main_menu_bar = memnew(MenuBar);
|
||||
main_menu_bar->set_mouse_filter(Control::MOUSE_FILTER_STOP);
|
||||
@@ -7814,13 +7807,6 @@ void EditorNode::_update_main_menu_type() {
|
||||
memdelete_notnull(main_menu_button);
|
||||
menu_btn_spacer = nullptr;
|
||||
main_menu_button = nullptr;
|
||||
|
||||
if (project_run_bar != nullptr) {
|
||||
// Adjust spacers to center 2D / 3D / Script buttons.
|
||||
int max_w = MAX(project_run_bar->get_minimum_size().x + right_menu_hb->get_minimum_size().x, main_menu_bar->get_minimum_size().x);
|
||||
left_spacer->set_custom_minimum_size(Size2(MAX(0, max_w - main_menu_bar->get_minimum_size().x), 0));
|
||||
right_spacer->set_custom_minimum_size(Size2(MAX(0, max_w - project_run_bar->get_minimum_size().x - right_menu_hb->get_minimum_size().x), 0));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9179,16 +9165,6 @@ EditorNode::EditorNode() {
|
||||
add_child(screenshot_timer);
|
||||
screenshot_timer->set_owner(get_owner());
|
||||
|
||||
// Adjust spacers to center 2D / 3D / Script buttons.
|
||||
if (main_menu_button != nullptr) {
|
||||
int max_w = MAX(project_run_bar->get_minimum_size().x + right_menu_hb->get_minimum_size().x, main_menu_button->get_minimum_size().x);
|
||||
left_spacer->set_custom_minimum_size(Size2(MAX(0, max_w - main_menu_button->get_minimum_size().x), 0));
|
||||
right_spacer->set_custom_minimum_size(Size2(MAX(0, max_w - project_run_bar->get_minimum_size().x - right_menu_hb->get_minimum_size().x), 0));
|
||||
} else {
|
||||
int max_w = MAX(project_run_bar->get_minimum_size().x + right_menu_hb->get_minimum_size().x, main_menu_bar->get_minimum_size().x);
|
||||
left_spacer->set_custom_minimum_size(Size2(MAX(0, max_w - main_menu_bar->get_minimum_size().x), 0));
|
||||
right_spacer->set_custom_minimum_size(Size2(MAX(0, max_w - project_run_bar->get_minimum_size().x - right_menu_hb->get_minimum_size().x), 0));
|
||||
}
|
||||
// Extend menu bar to window title.
|
||||
if (can_expand) {
|
||||
DisplayServer::get_singleton()->process_events();
|
||||
|
||||
Reference in New Issue
Block a user