asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #65543 from KoBeWi/out_of_context

Browse source 
Fix undo actions in SceneTreeDock
This commit is contained in:
Rémi Verschelde 2022-09-08 23:35:39 +02:00 committed by GitHub
commit fbb9ccc071
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
editor/scene_tree_dock.cpp
View file

@ -1987,7 +1987,7 @@ void SceneTreeDock::_script_created(Ref<Script> p_script) {
Node *node = selected.front()->get(); Node *node = selected.front()->get();
Ref<Script> existing = node->get_script(); Ref<Script> existing = node->get_script();
editor_data->get_undo_redo()->create_action(TTR("Attach Script")); editor_data->get_undo_redo()->create_action(TTR("Attach Script"), UndoRedo::MERGE_DISABLE, node);
editor_data->get_undo_redo()->add_do_method(InspectorDock::get_singleton(), "store_script_properties", node); editor_data->get_undo_redo()->add_do_method(InspectorDock::get_singleton(), "store_script_properties", node);
editor_data->get_undo_redo()->add_undo_method(InspectorDock::get_singleton(), "store_script_properties", node); editor_data->get_undo_redo()->add_undo_method(InspectorDock::get_singleton(), "store_script_properties", node);
editor_data->get_undo_redo()->add_do_method(node, "set_script", p_script); editor_data->get_undo_redo()->add_do_method(node, "set_script", p_script);
@ -1998,7 +1998,7 @@ void SceneTreeDock::_script_created(Ref<Script> p_script) {
editor_data->get_undo_redo()->add_undo_method(this, "_update_script_button"); editor_data->get_undo_redo()->add_undo_method(this, "_update_script_button");
editor_data->get_undo_redo()->commit_action(); editor_data->get_undo_redo()->commit_action();
} else { } else {
editor_data->get_undo_redo()->create_action(TTR("Attach Script")); editor_data->get_undo_redo()->create_action(TTR("Attach Script"), UndoRedo::MERGE_DISABLE, selected.front()->get());
for (Node *E : selected) { for (Node *E : selected) {
Ref<Script> existing = E->get_script(); Ref<Script> existing = E->get_script();
editor_data->get_undo_redo()->add_do_method(InspectorDock::get_singleton(), "store_script_properties", E); editor_data->get_undo_redo()->add_do_method(InspectorDock::get_singleton(), "store_script_properties", E);
@ -2093,9 +2093,9 @@ void SceneTreeDock::_delete_confirm(bool p_cut) {
EditorNode::get_singleton()->get_editor_plugins_over()->make_visible(false); EditorNode::get_singleton()->get_editor_plugins_over()->make_visible(false);
if (p_cut) { if (p_cut) {
editor_data->get_undo_redo()->create_action(TTR("Cut Node(s)")); editor_data->get_undo_redo()->create_action(TTR("Cut Node(s)"), UndoRedo::MERGE_DISABLE, remove_list.front()->get());
} else { } else {
editor_data->get_undo_redo()->create_action(TTR("Remove Node(s)")); editor_data->get_undo_redo()->create_action(TTR("Remove Node(s)"), UndoRedo::MERGE_DISABLE, remove_list.front()->get());
} }
bool entire_scene = false; bool entire_scene = false;
@ -2103,6 +2103,7 @@ void SceneTreeDock::_delete_confirm(bool p_cut) {
for (const Node *E : remove_list) { for (const Node *E : remove_list) {
if (E == edited_scene) { if (E == edited_scene) {
entire_scene = true; entire_scene = true;
break;
} }
} }
@ -2220,7 +2221,7 @@ void SceneTreeDock::_do_create(Node *p_parent) {
Node *child = Object::cast_to<Node>(c); Node *child = Object::cast_to<Node>(c);
ERR_FAIL_COND(!child); ERR_FAIL_COND(!child);
editor_data->get_undo_redo()->create_action(TTR("Create Node")); editor_data->get_undo_redo()->create_action_for_history(TTR("Create Node"), editor_data->get_current_edited_scene_history_id());
if (edited_scene) { if (edited_scene) {
editor_data->get_undo_redo()->add_do_method(p_parent, "add_child", child, true); editor_data->get_undo_redo()->add_do_method(p_parent, "add_child", child, true);
@ -2637,7 +2638,7 @@ void SceneTreeDock::_script_dropped(String p_file, NodePath p_to) {
Ref<Script> scr = ResourceLoader::load(p_file); Ref<Script> scr = ResourceLoader::load(p_file);
ERR_FAIL_COND(!scr.is_valid()); ERR_FAIL_COND(!scr.is_valid());
if (Node *n = get_node(p_to)) { if (Node *n = get_node(p_to)) {
editor_data->get_undo_redo()->create_action(TTR("Attach Script")); editor_data->get_undo_redo()->create_action(TTR("Attach Script"), UndoRedo::MERGE_DISABLE, n);
editor_data->get_undo_redo()->add_do_method(InspectorDock::get_singleton(), "store_script_properties", n); editor_data->get_undo_redo()->add_do_method(InspectorDock::get_singleton(), "store_script_properties", n);
editor_data->get_undo_redo()->add_undo_method(InspectorDock::get_singleton(), "store_script_properties", n); editor_data->get_undo_redo()->add_undo_method(InspectorDock::get_singleton(), "store_script_properties", n);
editor_data->get_undo_redo()->add_do_method(n, "set_script", scr); editor_data->get_undo_redo()->add_do_method(n, "set_script", scr);