summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
Diffstat (limited to 'editor')
-rw-r--r--editor/action_map_editor.cpp42
-rw-r--r--editor/editor_file_system.cpp4
-rw-r--r--editor/editor_resource_preview.cpp2
-rw-r--r--editor/import/resource_importer_texture_atlas.cpp7
-rw-r--r--editor/import/resource_importer_texture_atlas.h1
-rw-r--r--editor/import_dock.cpp23
-rw-r--r--editor/import_dock.h2
-rw-r--r--editor/plugins/animation_tree_editor_plugin.cpp2
-rw-r--r--editor/plugins/node_3d_editor_gizmos.cpp2
-rw-r--r--editor/plugins/script_editor_plugin.cpp159
-rw-r--r--editor/plugins/script_editor_plugin.h4
-rw-r--r--editor/plugins/script_text_editor.cpp2
-rw-r--r--editor/scene_tree_editor.cpp2
13 files changed, 214 insertions, 38 deletions
diff --git a/editor/action_map_editor.cpp b/editor/action_map_editor.cpp
index 38db48a4d4..363d542fd5 100644
--- a/editor/action_map_editor.cpp
+++ b/editor/action_map_editor.cpp
@@ -126,28 +126,30 @@ void InputEventConfigurationDialog::_set_event(const Ref<InputEvent> &p_event) {
while (category) {
TreeItem *input_item = category->get_first_child();
- // has_type this should be always true, unless the tree structure has been misconfigured.
- bool has_type = input_item->get_parent()->has_meta("__type");
- int input_type = input_item->get_parent()->get_meta("__type");
- if (!has_type) {
- return;
- }
+ if (input_item != nullptr) {
+ // has_type this should be always true, unless the tree structure has been misconfigured.
+ bool has_type = input_item->get_parent()->has_meta("__type");
+ int input_type = input_item->get_parent()->get_meta("__type");
+ if (!has_type) {
+ return;
+ }
- // If event type matches input types of this category.
- if ((k.is_valid() && input_type == INPUT_KEY) || (joyb.is_valid() && input_type == INPUT_JOY_BUTTON) || (joym.is_valid() && input_type == INPUT_JOY_MOTION) || (mb.is_valid() && input_type == INPUT_MOUSE_BUTTON)) {
- // Loop through all items of this category until one matches.
- while (input_item) {
- bool key_match = k.is_valid() && (Variant(k->get_keycode()) == input_item->get_meta("__keycode") || Variant(k->get_physical_keycode()) == input_item->get_meta("__keycode"));
- bool joyb_match = joyb.is_valid() && Variant(joyb->get_button_index()) == input_item->get_meta("__index");
- bool joym_match = joym.is_valid() && Variant(joym->get_axis()) == input_item->get_meta("__axis") && joym->get_axis_value() == (float)input_item->get_meta("__value");
- bool mb_match = mb.is_valid() && Variant(mb->get_button_index()) == input_item->get_meta("__index");
- if (key_match || joyb_match || joym_match || mb_match) {
- category->set_collapsed(false);
- input_item->select(0);
- input_list_tree->ensure_cursor_is_visible();
- return;
+ // If event type matches input types of this category.
+ if ((k.is_valid() && input_type == INPUT_KEY) || (joyb.is_valid() && input_type == INPUT_JOY_BUTTON) || (joym.is_valid() && input_type == INPUT_JOY_MOTION) || (mb.is_valid() && input_type == INPUT_MOUSE_BUTTON)) {
+ // Loop through all items of this category until one matches.
+ while (input_item) {
+ bool key_match = k.is_valid() && (Variant(k->get_keycode()) == input_item->get_meta("__keycode") || Variant(k->get_physical_keycode()) == input_item->get_meta("__keycode"));
+ bool joyb_match = joyb.is_valid() && Variant(joyb->get_button_index()) == input_item->get_meta("__index");
+ bool joym_match = joym.is_valid() && Variant(joym->get_axis()) == input_item->get_meta("__axis") && joym->get_axis_value() == (float)input_item->get_meta("__value");
+ bool mb_match = mb.is_valid() && Variant(mb->get_button_index()) == input_item->get_meta("__index");
+ if (key_match || joyb_match || joym_match || mb_match) {
+ category->set_collapsed(false);
+ input_item->select(0);
+ input_list_tree->ensure_cursor_is_visible();
+ return;
+ }
+ input_item = input_item->get_next();
}
- input_item = input_item->get_next();
}
}
diff --git a/editor/editor_file_system.cpp b/editor/editor_file_system.cpp
index 953989aadd..6fef65c92d 100644
--- a/editor/editor_file_system.cpp
+++ b/editor/editor_file_system.cpp
@@ -1078,8 +1078,8 @@ void EditorFileSystem::_scan_fs_changes(EditorFileSystemDirectory *p_dir, const
}
for (int i = 0; i < p_dir->subdirs.size(); i++) {
- if (updated_dir && !p_dir->subdirs[i]->verified) {
- //this directory was removed, add action to remove it
+ if ((updated_dir && !p_dir->subdirs[i]->verified) || _should_skip_directory(p_dir->subdirs[i]->get_path())) {
+ //this directory was removed or ignored, add action to remove it
ItemAction ia;
ia.action = ItemAction::ACTION_DIR_REMOVE;
ia.dir = p_dir->subdirs[i];
diff --git a/editor/editor_resource_preview.cpp b/editor/editor_resource_preview.cpp
index 8fc1345f3e..8783fe4fc0 100644
--- a/editor/editor_resource_preview.cpp
+++ b/editor/editor_resource_preview.cpp
@@ -439,7 +439,7 @@ void EditorResourcePreview::stop() {
preview_sem.post();
while (!exited.is_set()) {
OS::get_singleton()->delay_usec(10000);
- RenderingServer::get_singleton()->sync(); //sync pending stuff, as thread may be blocked on visual server
+ RenderingServer::get_singleton()->sync(); //sync pending stuff, as thread may be blocked on rendering server
}
thread.wait_to_finish();
}
diff --git a/editor/import/resource_importer_texture_atlas.cpp b/editor/import/resource_importer_texture_atlas.cpp
index 36fd161c35..cf699599ae 100644
--- a/editor/import/resource_importer_texture_atlas.cpp
+++ b/editor/import/resource_importer_texture_atlas.cpp
@@ -74,6 +74,7 @@ String ResourceImporterTextureAtlas::get_preset_name(int p_idx) const {
void ResourceImporterTextureAtlas::get_import_options(List<ImportOption> *r_options, int p_preset) const {
r_options->push_back(ImportOption(PropertyInfo(Variant::STRING, "atlas_file", PROPERTY_HINT_SAVE_FILE, "*.png"), ""));
r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "import_mode", PROPERTY_HINT_ENUM, "Region,Mesh2D"), 0));
+ r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "crop_to_region"), false));
}
String ResourceImporterTextureAtlas::get_option_group_file() const {
@@ -206,6 +207,7 @@ Error ResourceImporterTextureAtlas::import_group_file(const String &p_group_file
ERR_CONTINUE(err != OK);
pack_data.image = image;
+ pack_data.is_cropped = options["crop_to_region"];
int mode = options["import_mode"];
@@ -324,7 +326,10 @@ Error ResourceImporterTextureAtlas::import_group_file(const String &p_group_file
atlas_texture.instantiate();
atlas_texture->set_atlas(cache);
atlas_texture->set_region(Rect2(offset, pack_data.region.size));
- atlas_texture->set_margin(Rect2(pack_data.region.position, pack_data.image->get_size() - pack_data.region.size));
+
+ if (!pack_data.is_cropped) {
+ atlas_texture->set_margin(Rect2(pack_data.region.position, pack_data.image->get_size() - pack_data.region.size));
+ }
texture = atlas_texture;
} else {
diff --git a/editor/import/resource_importer_texture_atlas.h b/editor/import/resource_importer_texture_atlas.h
index b675d12477..d518a120bf 100644
--- a/editor/import/resource_importer_texture_atlas.h
+++ b/editor/import/resource_importer_texture_atlas.h
@@ -38,6 +38,7 @@ class ResourceImporterTextureAtlas : public ResourceImporter {
struct PackData {
Rect2 region;
+ bool is_cropped = false;
bool is_mesh = false;
Vector<int> chart_pieces; //one for region, many for mesh
Vector<Vector<Vector2>> chart_vertices; //for mesh
diff --git a/editor/import_dock.cpp b/editor/import_dock.cpp
index 5b52554335..a6e1e1d094 100644
--- a/editor/import_dock.cpp
+++ b/editor/import_dock.cpp
@@ -130,6 +130,7 @@ void ImportDock::set_edit_path(const String &p_path) {
_add_keep_import_option(importer_name);
import->set_disabled(false);
+ _set_dirty(false);
import_as->set_disabled(false);
preset->set_disabled(false);
@@ -280,6 +281,7 @@ void ImportDock::set_edit_multiple_paths(const Vector<String> &p_paths) {
params->paths = p_paths;
import->set_disabled(false);
+ _set_dirty(false);
import_as->set_disabled(false);
preset->set_disabled(false);
@@ -533,6 +535,8 @@ void ImportDock::_reimport() {
EditorFileSystem::get_singleton()->reimport_files(params->paths);
EditorFileSystem::get_singleton()->emit_signal(SNAME("filesystem_changed")); //it changed, so force emitting the signal
+
+ _set_dirty(false);
}
void ImportDock::_notification(int p_what) {
@@ -548,6 +552,24 @@ void ImportDock::_notification(int p_what) {
}
}
+void ImportDock::_property_edited(const StringName &p_prop) {
+ _set_dirty(true);
+}
+
+void ImportDock::_set_dirty(bool p_dirty) {
+ if (p_dirty) {
+ // Add a dirty marker to notify the user that they should reimport the selected resource to see changes.
+ import->set_text(TTR("Reimport") + " (*)");
+ import->add_theme_color_override("font_color", get_theme_color(SNAME("warning_color"), SNAME("Editor")));
+ import->set_tooltip(TTR("You have pending changes that haven't been applied yet. Click Reimport to apply changes made to the import options.\nSelecting another resource in the FileSystem dock without clicking Reimport first will discard changes made in the Import dock."));
+ } else {
+ // Remove the dirty marker on the Reimport button.
+ import->set_text(TTR("Reimport"));
+ import->remove_theme_color_override("font_color");
+ import->set_tooltip("");
+ }
+}
+
void ImportDock::_property_toggled(const StringName &p_prop, bool p_checked) {
if (p_checked) {
params->checked.insert(p_prop);
@@ -588,6 +610,7 @@ ImportDock::ImportDock() {
import_opts = memnew(EditorInspector);
add_child(import_opts);
import_opts->set_v_size_flags(SIZE_EXPAND_FILL);
+ import_opts->connect("property_edited", callable_mp(this, &ImportDock::_property_edited));
import_opts->connect("property_toggled", callable_mp(this, &ImportDock::_property_toggled));
hb = memnew(HBoxContainer);
diff --git a/editor/import_dock.h b/editor/import_dock.h
index 3c28bbcd89..150c44576d 100644
--- a/editor/import_dock.h
+++ b/editor/import_dock.h
@@ -68,7 +68,9 @@ class ImportDock : public VBoxContainer {
void _update_preset_menu();
void _add_keep_import_option(const String &p_importer_name);
+ void _property_edited(const StringName &p_prop);
void _property_toggled(const StringName &p_prop, bool p_checked);
+ void _set_dirty(bool p_dirty);
void _reimport_attempt();
void _reimport_and_restart();
void _reimport();
diff --git a/editor/plugins/animation_tree_editor_plugin.cpp b/editor/plugins/animation_tree_editor_plugin.cpp
index cd84be0c25..6c5606fbfd 100644
--- a/editor/plugins/animation_tree_editor_plugin.cpp
+++ b/editor/plugins/animation_tree_editor_plugin.cpp
@@ -55,7 +55,7 @@ void AnimationTreeEditor::edit(AnimationTree *p_tree) {
tree = p_tree;
Vector<String> path;
- if (tree->has_meta("_tree_edit_path")) {
+ if (tree && tree->has_meta("_tree_edit_path")) {
path = tree->get_meta("_tree_edit_path");
edit_path(path);
} else {
diff --git a/editor/plugins/node_3d_editor_gizmos.cpp b/editor/plugins/node_3d_editor_gizmos.cpp
index f1b25c0dde..4d2fc29fe0 100644
--- a/editor/plugins/node_3d_editor_gizmos.cpp
+++ b/editor/plugins/node_3d_editor_gizmos.cpp
@@ -832,7 +832,7 @@ void EditorNode3DGizmo::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_plugin"), &EditorNode3DGizmo::get_plugin);
ClassDB::bind_method(D_METHOD("clear"), &EditorNode3DGizmo::clear);
ClassDB::bind_method(D_METHOD("set_hidden", "hidden"), &EditorNode3DGizmo::set_hidden);
- ClassDB::bind_method(D_METHOD("is_subgizmo_selected"), &EditorNode3DGizmo::is_subgizmo_selected);
+ ClassDB::bind_method(D_METHOD("is_subgizmo_selected", "id"), &EditorNode3DGizmo::is_subgizmo_selected);
ClassDB::bind_method(D_METHOD("get_subgizmo_selection"), &EditorNode3DGizmo::get_subgizmo_selection);
GDVIRTUAL_BIND(_redraw);
diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp
index ccb63871b7..5df6743f4c 100644
--- a/editor/plugins/script_editor_plugin.cpp
+++ b/editor/plugins/script_editor_plugin.cpp
@@ -484,14 +484,32 @@ void ScriptEditor::_clear_execution(REF p_script) {
void ScriptEditor::_set_breakpoint(REF p_script, int p_line, bool p_enabled) {
Ref<Script> script = Object::cast_to<Script>(*p_script);
if (script.is_valid() && (script->has_source_code() || script->get_path().is_resource_file())) {
- if (edit(p_script, p_line, 0, false)) {
- editor->push_item(p_script.ptr());
-
- ScriptEditorBase *se = _get_current_editor();
- if (se) {
+ // Update if open.
+ for (int i = 0; i < tab_container->get_child_count(); i++) {
+ ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_child(i));
+ if (se && se->get_edited_resource()->get_path() == script->get_path()) {
se->set_breakpoint(p_line, p_enabled);
+ return;
+ }
+ }
+
+ // Handle closed.
+ Dictionary state = script_editor_cache->get_value(script->get_path(), "state");
+ Array breakpoints;
+ if (state.has("breakpoints")) {
+ breakpoints = state["breakpoints"];
+ }
+
+ if (breakpoints.has(p_line)) {
+ if (!p_enabled) {
+ breakpoints.erase(p_line);
}
+ } else if (p_enabled) {
+ breakpoints.push_back(p_line);
}
+ state["breakpoints"] = breakpoints;
+ script_editor_cache->set_value(script->get_path(), "state", state);
+ EditorDebuggerNode::get_singleton()->set_breakpoint(script->get_path(), p_line + 1, false);
}
}
@@ -502,6 +520,34 @@ void ScriptEditor::_clear_breakpoints() {
se->clear_breakpoints();
}
}
+
+ // Clear from closed scripts.
+ List<String> cached_editors;
+ script_editor_cache->get_sections(&cached_editors);
+ for (const String &E : cached_editors) {
+ Array breakpoints = _get_cached_breakpoints_for_script(E);
+ for (int i = 0; i < breakpoints.size(); i++) {
+ EditorDebuggerNode::get_singleton()->set_breakpoint(E, (int)breakpoints[i] + 1, false);
+ }
+
+ if (breakpoints.size() > 0) {
+ Dictionary state = script_editor_cache->get_value(E, "state");
+ state["breakpoints"] = Array();
+ script_editor_cache->set_value(E, "state", state);
+ }
+ }
+}
+
+Array ScriptEditor::_get_cached_breakpoints_for_script(const String &p_path) const {
+ if (!ResourceLoader::exists(p_path, "Script") || p_path.begins_with("local://") || !script_editor_cache->has_section_key(p_path, "state")) {
+ return Array();
+ }
+
+ Dictionary state = script_editor_cache->get_value(p_path, "state");
+ if (!state.has("breakpoints")) {
+ return Array();
+ }
+ return state["breakpoints"];
}
ScriptEditorBase *ScriptEditor::_get_current_editor() const {
@@ -756,6 +802,7 @@ 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);
if (idx >= tab_container->get_child_count()) {
@@ -1485,6 +1532,7 @@ void ScriptEditor::_notification(int p_what) {
editor->connect("stop_pressed", callable_mp(this, &ScriptEditor::_editor_stop));
editor->connect("script_add_function_request", callable_mp(this, &ScriptEditor::_add_callback));
editor->connect("resource_saved", callable_mp(this, &ScriptEditor::_res_saved_callback));
+ editor->get_filesystem_dock()->connect("files_moved", callable_mp(this, &ScriptEditor::_files_moved));
editor->get_filesystem_dock()->connect("file_removed", callable_mp(this, &ScriptEditor::_file_removed));
script_list->connect("item_selected", callable_mp(this, &ScriptEditor::_script_selected));
@@ -1597,6 +1645,7 @@ void ScriptEditor::notify_script_changed(const Ref<Script> &p_script) {
}
void ScriptEditor::get_breakpoints(List<String> *p_breakpoints) {
+ Set<String> loaded_scripts;
for (int i = 0; i < tab_container->get_child_count(); i++) {
ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_child(i));
if (!se) {
@@ -1609,6 +1658,7 @@ void ScriptEditor::get_breakpoints(List<String> *p_breakpoints) {
}
String base = script->get_path();
+ loaded_scripts.insert(base);
if (base.begins_with("local://") || base == "") {
continue;
}
@@ -1618,6 +1668,20 @@ void ScriptEditor::get_breakpoints(List<String> *p_breakpoints) {
p_breakpoints->push_back(base + ":" + itos((int)bpoints[j] + 1));
}
}
+
+ // Load breakpoints that are in closed scripts.
+ List<String> cached_editors;
+ script_editor_cache->get_sections(&cached_editors);
+ for (const String &E : cached_editors) {
+ if (loaded_scripts.has(E)) {
+ continue;
+ }
+
+ Array breakpoints = _get_cached_breakpoints_for_script(E);
+ for (int i = 0; i < breakpoints.size(); i++) {
+ p_breakpoints->push_back(E + ":" + itos((int)breakpoints[i] + 1));
+ }
+ }
}
void ScriptEditor::_members_overview_selected(int p_idx) {
@@ -2275,6 +2339,10 @@ bool ScriptEditor::edit(const RES &p_resource, int p_line, int p_col, bool p_gra
_add_recent_script(p_resource->get_path());
}
+ if (script_editor_cache->has_section(p_resource->get_path())) {
+ se->set_edit_state(script_editor_cache->get_value(p_resource->get_path(), "state"));
+ }
+
_sort_list_on_update = true;
_update_script_names();
_save_layout();
@@ -2510,6 +2578,20 @@ void ScriptEditor::_add_callback(Object *p_obj, const String &p_function, const
}
}
+void ScriptEditor::_save_editor_state(ScriptEditorBase *p_editor) {
+ if (restoring_layout) {
+ return;
+ }
+
+ const String &path = p_editor->get_edited_resource()->get_path();
+ if (!path.is_resource_file()) {
+ return;
+ }
+
+ script_editor_cache->set_value(path, "state", p_editor->get_edit_state());
+ // This is saved later when we save the editor layout.
+}
+
void ScriptEditor::_save_layout() {
if (restoring_layout) {
return;
@@ -2555,6 +2637,26 @@ void ScriptEditor::_filesystem_changed() {
_update_script_names();
}
+void ScriptEditor::_files_moved(const String &p_old_file, const String &p_new_file) {
+ if (!script_editor_cache->has_section(p_old_file)) {
+ return;
+ }
+ Variant state = script_editor_cache->get_value(p_old_file, "state");
+ script_editor_cache->erase_section(p_old_file);
+ script_editor_cache->set_value(p_new_file, "state", state);
+
+ // If Script, update breakpoints with debugger.
+ Array breakpoints = _get_cached_breakpoints_for_script(p_new_file);
+ for (int i = 0; i < breakpoints.size(); i++) {
+ int line = (int)breakpoints[i] + 1;
+ EditorDebuggerNode::get_singleton()->set_breakpoint(p_old_file, line, false);
+ if (!p_new_file.begins_with("local://") && ResourceLoader::exists(p_new_file, "Script")) {
+ EditorDebuggerNode::get_singleton()->set_breakpoint(p_new_file, line, true);
+ }
+ }
+ // This is saved later when we save the editor layout.
+}
+
void ScriptEditor::_file_removed(const String &p_removed_file) {
for (int i = 0; i < tab_container->get_child_count(); i++) {
ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_child(i));
@@ -2566,6 +2668,15 @@ void ScriptEditor::_file_removed(const String &p_removed_file) {
_close_tab(i, false, false);
}
}
+
+ // Check closed.
+ if (script_editor_cache->has_section(p_removed_file)) {
+ Array breakpoints = _get_cached_breakpoints_for_script(p_removed_file);
+ for (int i = 0; i < breakpoints.size(); i++) {
+ EditorDebuggerNode::get_singleton()->set_breakpoint(p_removed_file, (int)breakpoints[i] + 1, false);
+ }
+ script_editor_cache->erase_section(p_removed_file);
+ }
}
void ScriptEditor::_update_find_replace_bar() {
@@ -2916,6 +3027,7 @@ void ScriptEditor::set_window_layout(Ref<ConfigFile> p_layout) {
restoring_layout = true;
+ Set<String> loaded_scripts;
List<String> extensions;
ResourceLoader::get_recognized_extensions_for_type("Script", &extensions);
@@ -2928,8 +3040,12 @@ void ScriptEditor::set_window_layout(Ref<ConfigFile> p_layout) {
}
if (!FileAccess::exists(path)) {
+ if (script_editor_cache->has_section(path)) {
+ script_editor_cache->erase_section(path);
+ }
continue;
}
+ loaded_scripts.insert(path);
if (extensions.find(path.get_extension())) {
Ref<Script> scr = ResourceLoader::load(path);
@@ -2974,6 +3090,26 @@ void ScriptEditor::set_window_layout(Ref<ConfigFile> p_layout) {
script_split->set_split_offset(p_layout->get_value("ScriptEditor", "split_offset"));
}
+ // Remove any deleted editors that have been removed between launches.
+ // and if a Script, register breakpoints with the debugger.
+ List<String> cached_editors;
+ script_editor_cache->get_sections(&cached_editors);
+ for (const String &E : cached_editors) {
+ if (loaded_scripts.has(E)) {
+ continue;
+ }
+
+ if (!FileAccess::exists(E)) {
+ script_editor_cache->erase_section(E);
+ continue;
+ }
+
+ Array breakpoints = _get_cached_breakpoints_for_script(E);
+ for (int i = 0; i < breakpoints.size(); i++) {
+ EditorDebuggerNode::get_singleton()->set_breakpoint(E, (int)breakpoints[i] + 1, true);
+ }
+ }
+
restoring_layout = false;
_update_script_names();
@@ -2991,11 +3127,8 @@ void ScriptEditor::get_window_layout(Ref<ConfigFile> p_layout) {
continue;
}
- Dictionary script_info;
- script_info["path"] = path;
- script_info["state"] = se->get_edit_state();
-
- scripts.push_back(script_info);
+ _save_editor_state(se);
+ scripts.push_back(path);
}
EditorHelp *eh = Object::cast_to<EditorHelp>(tab_container->get_child(i));
@@ -3008,6 +3141,9 @@ void ScriptEditor::get_window_layout(Ref<ConfigFile> p_layout) {
p_layout->set_value("ScriptEditor", "open_scripts", scripts);
p_layout->set_value("ScriptEditor", "open_help", helps);
p_layout->set_value("ScriptEditor", "split_offset", script_split->get_split_offset());
+
+ // Save the cache.
+ script_editor_cache->save(EditorSettings::get_singleton()->get_project_settings_dir().plus_file("script_editor_cache.cfg"));
}
void ScriptEditor::_help_class_open(const String &p_class) {
@@ -3374,6 +3510,9 @@ void ScriptEditor::_bind_methods() {
ScriptEditor::ScriptEditor(EditorNode *p_editor) {
current_theme = "";
+ script_editor_cache.instantiate();
+ script_editor_cache->load(EditorSettings::get_singleton()->get_project_settings_dir().plus_file("script_editor_cache.cfg"));
+
completion_cache = memnew(EditorScriptCodeCompletionCache);
restoring_layout = false;
waiting_update_names = false;
diff --git a/editor/plugins/script_editor_plugin.h b/editor/plugins/script_editor_plugin.h
index e0c7e668ce..ce26699280 100644
--- a/editor/plugins/script_editor_plugin.h
+++ b/editor/plugins/script_editor_plugin.h
@@ -382,13 +382,17 @@ class ScriptEditor : public PanelContainer {
void _script_created(Ref<Script> p_script);
void _set_breakpoint(REF p_scrpt, int p_line, bool p_enabled);
void _clear_breakpoints();
+ Array _get_cached_breakpoints_for_script(const String &p_path) const;
ScriptEditorBase *_get_current_editor() const;
Array _get_open_script_editors() const;
+ Ref<ConfigFile> script_editor_cache;
+ void _save_editor_state(ScriptEditorBase *p_editor);
void _save_layout();
void _editor_settings_changed();
void _filesystem_changed();
+ void _files_moved(const String &p_old_file, const String &p_new_file);
void _file_removed(const String &p_file);
void _autosave_scripts();
void _update_autosave_timer();
diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp
index 701d75fb08..1c251075de 100644
--- a/editor/plugins/script_text_editor.cpp
+++ b/editor/plugins/script_text_editor.cpp
@@ -1707,7 +1707,6 @@ void ScriptTextEditor::_enable_code_editor() {
code_editor->connect("show_warnings_panel", callable_mp(this, &ScriptTextEditor::_show_warnings_panel));
code_editor->connect("validate_script", callable_mp(this, &ScriptTextEditor::_validate_script));
code_editor->connect("load_theme_settings", callable_mp(this, &ScriptTextEditor::_load_theme_settings));
- code_editor->get_text_editor()->connect("breakpoint_toggled", callable_mp(this, &ScriptTextEditor::_breakpoint_toggled));
code_editor->get_text_editor()->connect("symbol_lookup", callable_mp(this, &ScriptTextEditor::_lookup_symbol));
code_editor->get_text_editor()->connect("symbol_validate", callable_mp(this, &ScriptTextEditor::_validate_symbol));
code_editor->get_text_editor()->connect("gutter_added", callable_mp(this, &ScriptTextEditor::_update_gutter_indexes));
@@ -1847,6 +1846,7 @@ ScriptTextEditor::ScriptTextEditor() {
code_editor->get_text_editor()->set_draw_breakpoints_gutter(true);
code_editor->get_text_editor()->set_draw_executing_lines_gutter(true);
+ code_editor->get_text_editor()->connect("breakpoint_toggled", callable_mp(this, &ScriptTextEditor::_breakpoint_toggled));
connection_gutter = 1;
code_editor->get_text_editor()->add_gutter(connection_gutter);
diff --git a/editor/scene_tree_editor.cpp b/editor/scene_tree_editor.cpp
index c944068455..73523474ef 100644
--- a/editor/scene_tree_editor.cpp
+++ b/editor/scene_tree_editor.cpp
@@ -527,7 +527,7 @@ void SceneTreeEditor::_node_removed(Node *p_node) {
}
void SceneTreeEditor::_node_renamed(Node *p_node) {
- if (!get_scene_node()->is_ancestor_of(p_node)) {
+ if (p_node != get_scene_node() && !get_scene_node()->is_ancestor_of(p_node)) {
return;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 20:44:27 +0000