Skip to content

Disconnect ScriptEditor script list from tree_changed signal #111309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −20
Open

Disconnect ScriptEditor script list from tree_changed signal #111309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 2 additions & 17 deletions editor/script/script_editor_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1849,7 +1849,6 @@ void ScriptEditor::_notification(int p_what) {
// Can't set own styles in NOTIFICATION_THEME_CHANGED, so for now this will do.
add_theme_style_override(SceneStringName(panel), get_theme_stylebox(SNAME("ScriptEditorPanel"), EditorStringName(EditorStyles)));

get_tree()->connect("tree_changed", callable_mp(this, &ScriptEditor::_tree_changed));
InspectorDock::get_singleton()->connect("request_help", callable_mp(this, &ScriptEditor::_help_class_open));
EditorNode::get_singleton()->connect("request_help_search", callable_mp(this, &ScriptEditor::_help_search));
EditorNode::get_singleton()->connect("scene_closed", callable_mp(this, &ScriptEditor::_close_builtin_scripts_from_scene));
Expand Down Expand Up @@ -2454,12 +2453,8 @@ void ScriptEditor::_update_script_names() {
}
}

if (!waiting_update_names) {
_update_members_overview();
_update_help_overview();
} else {
waiting_update_names = false;
}
_update_members_overview();
_update_help_overview();
_update_members_overview_visibility();
_update_help_overview_visibility();
_update_script_colors();
Expand Down Expand Up @@ -3187,15 +3182,6 @@ void ScriptEditor::_update_autosave_timer() {
}
}

void ScriptEditor::_tree_changed() {
if (waiting_update_names) {
return;
}

waiting_update_names = true;
callable_mp(this, &ScriptEditor::_update_script_names).call_deferred();
}

void ScriptEditor::_split_dragged(float) {
_save_layout();
}
Expand Down Expand Up @@ -4214,7 +4200,6 @@ ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) {
script_editor_cache->load(EditorPaths::get_singleton()->get_project_settings_dir().path_join("script_editor_cache.cfg"));

restoring_layout = false;
waiting_update_names = false;
pending_auto_reload = false;
auto_reload_running_scripts = true;
external_editor_active = false;
Expand Down
3 changes: 0 additions & 3 deletions editor/script/script_editor_plugin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,8 +504,6 @@ class ScriptEditor : public PanelContainer {

void _find_scripts(Node *p_base, Node *p_current, HashSet<Ref<Script>> &used);

void _tree_changed();

void _split_dragged(float);

Variant get_drag_data_fw(const Point2 &p_point, Control *p_from);
Expand All @@ -523,7 +521,6 @@ class ScriptEditor : public PanelContainer {
void _history_forward();
void _history_back();

bool waiting_update_names;
bool lock_history = false;

void _help_class_open(const String &p_class);
Expand Down