Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Use only one edit menu for TextEditors

Browse source
This commit is contained in:
kit 2025-11-03 18:34:35 -05:00
parent d48f9d45e2
commit ed687b84a3
6 changed files with 515 additions and 456 deletions
Download patch file Download diff file Expand all files Collapse all files

39
editor/script/script_editor_plugin.cpp
View file

@ -919,7 +919,6 @@ void ScriptEditor::_close_tab(int p_idx, bool p_save, bool p_history_back) {
int idx = tab_container->get_current_tab();
if (current) {
current->clear_edit_menu();
_save_editor_state(current);
}
memdelete(tselected);
@ -2080,7 +2079,7 @@ void ScriptEditor::ensure_select_current() {
if (tab_container->get_tab_count() && tab_container->get_current_tab() >= 0) {
ScriptEditorBase *se = _get_current_editor();
if (se) {
se->enable_editor(this);
se->enable_editor();
if (!grab_focus_block && is_visible_in_tree()) {
se->ensure_focus();
@ -2499,7 +2498,7 @@ void ScriptEditor::_update_script_names() {
ScriptEditorBase *se = _get_current_editor();
if (se) {
se->enable_editor(this);
se->enable_editor();
_update_selected_editor_menu();
}
}
@ -2624,7 +2623,7 @@ bool ScriptEditor::edit(const Ref<Resource> &p_resource, int p_line, int p_col,
if ((scr.is_valid() && se->get_edited_resource() == p_resource) || se->get_edited_resource()->get_path() == p_resource->get_path()) {
if (should_open) {
se->enable_editor(this);
se->enable_editor();
if (tab_container->get_current_tab() != i) {
_go_to_tab(i);
@ -2689,7 +2688,7 @@ bool ScriptEditor::edit(const Ref<Resource> &p_resource, int p_line, int p_col,
tab_container->add_child(se);
if (p_grab_focus) {
se->enable_editor(this);
se->enable_editor();
}
// If we delete a script within the filesystem, the original resource path
@ -2699,10 +2698,18 @@ bool ScriptEditor::edit(const Ref<Resource> &p_resource, int p_line, int p_col,
se->set_tooltip_request_func(callable_mp(this, &ScriptEditor::_get_debug_tooltip));
if (se->get_edit_menu()) {
se->get_edit_menu()->hide();
menu_hb->add_child(se->get_edit_menu());
menu_hb->move_child(se->get_edit_menu(), 1);
Control *editor_edit_menu = se->get_edit_menu();
if (editor_edit_menu && !editor_edit_menu->get_parent()) {
editor_edit_menu->hide();
editor_menus.push_back(editor_edit_menu);
menu_hb->add_child(editor_edit_menu);
menu_hb->move_child(editor_edit_menu, 1);
for (int i = 0; i < editor_edit_menu->get_child_count(); ++i) {
Control *c = Object::cast_to<Control>(editor_edit_menu->get_child(i));
if (c) {
c->set_shortcut_context(this);
}
}
}
if (p_grab_focus) {
@ -3829,17 +3836,9 @@ void ScriptEditor::update_docs_from_script(const Ref<Script> &p_script) {
}
void ScriptEditor::_update_selected_editor_menu() {
for (int i = 0; i < tab_container->get_tab_count(); i++) {
bool current = tab_container->get_current_tab() == i;
ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
if (se && se->get_edit_menu()) {
if (current) {
se->get_edit_menu()->show();
} else {
se->get_edit_menu()->hide();
}
}
ScriptEditorBase *current_editor = _get_current_editor();
for (Control *editor_menu : editor_menus) {
editor_menu->set_visible(current_editor && editor_menu == current_editor->get_edit_menu());
}
EditorHelp *eh = Object::cast_to<EditorHelp>(tab_container->get_current_tab_control());