godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-13 13:31:48 +00:00
Code Releases Wiki Activity

Add editor setting to collapse main menu

Browse Source
This commit is contained in:
Anish Mishra
2025-05-01 18:09:31 +05:30
parent 64b4598baa
commit e03942a6ef
5 changed files with 157 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

157
editor/editor_node.cpp
View File

@@ -573,6 +573,10 @@ void EditorNode::_update_theme(bool p_skip_creation) {
main_vbox->set_anchors_and_offsets_preset(Control::PRESET_FULL_RECT, Control::PRESET_MODE_MINSIZE, theme->get_constant(SNAME("window_border_margin"), EditorStringName(Editor)));
main_vbox->add_theme_constant_override("separation", theme->get_constant(SNAME("top_bar_separation"), EditorStringName(Editor)));
if (main_menu_button != nullptr) {
main_menu_button->set_button_icon(theme->get_icon(SNAME("TripleBar"), EditorStringName(EditorIcons)));
}
editor_main_screen->add_theme_style_override(SceneStringName(panel), theme->get_stylebox(SNAME("Content"), EditorStringName(EditorStyles)));
bottom_panel->add_theme_style_override(SceneStringName(panel), theme->get_stylebox(SNAME("BottomPanel"), EditorStringName(EditorStyles)));
distraction_free->set_button_icon(theme->get_icon(SNAME("DistractionFree"), EditorStringName(EditorIcons)));
@@ -934,6 +938,7 @@ void EditorNode::_notification(int p_what) {
if (EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor")) {
_update_update_spinner();
_update_vsync_mode();
_update_main_menu_type();
DisplayServer::get_singleton()->screen_set_keep_on(EDITOR_GET("interface/editor/keep_screen_on"));
}
@@ -7080,6 +7085,112 @@ void EditorNode::set_unfocused_low_processor_usage_mode_enabled(bool p_enabled)
unfocused_low_processor_usage_mode_enabled = p_enabled;
}
void EditorNode::_update_main_menu_type() {
bool use_menu_button = EDITOR_GET("interface/editor/collapse_main_menu");
bool global_menu = !bool(EDITOR_GET("interface/editor/use_embedded_menu")) && NativeMenu::get_singleton()->has_feature(NativeMenu::FEATURE_GLOBAL_MENU);
bool already_using_button = main_menu_button != nullptr;
bool already_using_bar = main_menu_bar != nullptr;
if ((use_menu_button && already_using_button) || (!use_menu_button && already_using_bar)) {
return; // Already correctly configured.
}
if (use_menu_button && !global_menu) {
main_menu_button = memnew(MenuButton);
main_menu_button->set_text(TTRC("Main Menu"));
main_menu_button->set_theme_type_variation("MainScreenButton");
main_menu_button->set_focus_mode(Control::FOCUS_NONE);
if (is_inside_tree()) {
main_menu_button->set_button_icon(theme->get_icon(SNAME("TripleBar"), EditorStringName(EditorIcons)));
}
main_menu_button->set_switch_on_hover(true);
if (main_menu_bar != nullptr) {
Vector<PopupMenu *> menus_to_move;
for (int i = 0; i < main_menu_bar->get_child_count(); i++) {
PopupMenu *menu = Object::cast_to<PopupMenu>(main_menu_bar->get_child(i));
if (menu != nullptr) {
menus_to_move.push_back(menu);
}
}
for (PopupMenu *menu : menus_to_move) {
main_menu_bar->remove_child(menu);
main_menu_button->get_popup()->add_submenu_node_item(menu->get_name(), menu);
}
}
#ifdef ANDROID_ENABLED
// Align main menu icon visually with TouchActionsPanel buttons.
main_menu_button->get_popup()->add_theme_constant_override("v_separation", 16 * EDSCALE);
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);
#endif
title_bar->add_child(main_menu_button);
if (menu_btn_spacer == nullptr) {
title_bar->move_child(main_menu_button, 0);
} else {
title_bar->move_child(main_menu_button, 1);
}
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);
main_menu_bar->set_v_size_flags(Control::SIZE_SHRINK_CENTER);
main_menu_bar->set_theme_type_variation("MainMenuBar");
main_menu_bar->set_start_index(0); // Main menu, add to the start of global menu.
main_menu_bar->set_prefer_global_menu(global_menu);
main_menu_bar->set_switch_on_hover(true);
if (main_menu_button != nullptr) {
Vector<PopupMenu *> menus_to_move;
for (int i = 0; i < main_menu_button->get_item_count(); i++) {
PopupMenu *menu = main_menu_button->get_popup()->get_item_submenu_node(i);
if (menu != nullptr) {
menus_to_move.push_back(menu);
}
}
for (PopupMenu *menu : menus_to_move) {
menu->get_parent()->remove_child(menu);
main_menu_bar->add_child(menu);
}
}
title_bar->add_child(main_menu_bar);
title_bar->move_child(main_menu_bar, 0);
memdelete_notnull(menu_btn_spacer);
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));
}
}
}
void EditorNode::_add_to_main_menu(const String &p_name, PopupMenu *p_menu) {
p_menu->set_name(p_name);
if (main_menu_button != nullptr) {
main_menu_button->get_popup()->add_submenu_node_item(p_name, p_menu);
} else {
main_menu_bar->add_child(p_menu);
}
}
#ifdef ANDROID_ENABLED
void EditorNode::_touch_actions_panel_mode_changed() {
int panel_mode = EDITOR_GET("interface/touchscreen/touch_actions_panel");
@@ -7601,19 +7712,10 @@ EditorNode::EditorNode() {
title_bar->add_child(left_menu_spacer);
}
main_menu = memnew(MenuBar);
main_menu->set_mouse_filter(Control::MOUSE_FILTER_STOP);
title_bar->add_child(main_menu);
main_menu->set_v_size_flags(Control::SIZE_SHRINK_CENTER);
main_menu->set_theme_type_variation("MainMenuBar");
main_menu->set_start_index(0); // Main menu, add to the start of global menu.
main_menu->set_prefer_global_menu(global_menu);
main_menu->set_switch_on_hover(true);
_update_main_menu_type();
file_menu = memnew(PopupMenu);
file_menu->set_name(TTRC("Scene"));
main_menu->add_child(file_menu);
main_menu->set_menu_tooltip(0, TTR("Operations with scene files."));
_add_to_main_menu(TTRC("Scene"), file_menu);
accept = memnew(AcceptDialog);
accept->set_autowrap(true);
@@ -7728,7 +7830,7 @@ EditorNode::EditorNode() {
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);
main_menu_bar->add_child(apple_menu);
apple_menu->add_shortcut(ED_GET_SHORTCUT("editor/editor_settings"), EDITOR_OPEN_SETTINGS);
apple_menu->add_separator();
@@ -7737,8 +7839,7 @@ EditorNode::EditorNode() {
#endif
project_menu = memnew(PopupMenu);
project_menu->set_name(TTRC("Project"));
main_menu->add_child(project_menu);
_add_to_main_menu(TTRC("Project"), project_menu);
project_menu->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/project_settings", TTRC("Project Settings..."), Key::NONE, TTRC("Project Settings")), PROJECT_OPEN_SETTINGS);
project_menu->connect(SceneStringName(id_pressed), callable_mp(this, &EditorNode::_menu_option));
@@ -7770,7 +7871,7 @@ EditorNode::EditorNode() {
project_menu->add_shortcut(ED_GET_SHORTCUT("editor/quit_to_project_list"), PROJECT_QUIT_TO_PROJECT_MANAGER, true);
// Spacer to center 2D / 3D / Script buttons.
HBoxContainer *left_spacer = memnew(HBoxContainer);
left_spacer = memnew(HBoxContainer);
left_spacer->set_mouse_filter(Control::MOUSE_FILTER_PASS);
left_spacer->set_h_size_flags(Control::SIZE_EXPAND_FILL);
title_bar->add_child(left_spacer);
@@ -7794,12 +7895,10 @@ EditorNode::EditorNode() {
// Options are added and handled by DebuggerEditorPlugin.
debug_menu = memnew(PopupMenu);
debug_menu->set_name(TTRC("Debug"));
main_menu->add_child(debug_menu);
_add_to_main_menu(TTRC("Debug"), debug_menu);
settings_menu = memnew(PopupMenu);
settings_menu->set_name(TTRC("Editor"));
main_menu->add_child(settings_menu);
_add_to_main_menu(TTRC("Editor"), settings_menu);
#ifdef MACOS_ENABLED
if (!global_menu) {
@@ -7848,11 +7947,10 @@ EditorNode::EditorNode() {
#endif
help_menu = memnew(PopupMenu);
help_menu->set_name(TTRC("Help"));
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);
_add_to_main_menu(TTRC("Help"), help_menu);
help_menu->connect(SceneStringName(id_pressed), callable_mp(this, &EditorNode::_menu_option));
@@ -7877,7 +7975,7 @@ EditorNode::EditorNode() {
help_menu->add_icon_shortcut(_get_editor_theme_native_menu_icon(SNAME("Heart"), global_menu, dark_mode), ED_SHORTCUT_AND_COMMAND("editor/support_development", TTRC("Support Godot Development")), HELP_SUPPORT_GODOT_DEVELOPMENT);
// Spacer to center 2D / 3D / Script buttons.
Control *right_spacer = memnew(Control);
right_spacer = memnew(Control);
right_spacer->set_mouse_filter(Control::MOUSE_FILTER_PASS);
right_spacer->set_h_size_flags(Control::SIZE_EXPAND_FILL);
title_bar->add_child(right_spacer);
@@ -7888,7 +7986,7 @@ EditorNode::EditorNode() {
project_run_bar->connect("play_pressed", callable_mp(this, &EditorNode::_project_run_started));
project_run_bar->connect("stop_pressed", callable_mp(this, &EditorNode::_project_run_stopped));
HBoxContainer *right_menu_hb = memnew(HBoxContainer);
right_menu_hb = memnew(HBoxContainer);
right_menu_hb->set_mouse_filter(Control::MOUSE_FILTER_STOP);
title_bar->add_child(right_menu_hb);
@@ -8415,10 +8513,15 @@ EditorNode::EditorNode() {
screenshot_timer->set_owner(get_owner());
// 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->get_minimum_size().x);
left_spacer->set_custom_minimum_size(Size2(MAX(0, max_w - main_menu->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));
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();