Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-23 04:33:29 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #30196 from LikeLakers2/scenetreedock-script-creation-bugfix

Browse Source 
SceneTreeDock will now only attach scripts to the selected node if the ScriptCreateDialog was opened from the SceneTreeDock
This commit is contained in:
Rémi Verschelde 2019-07-01 21:13:46 +02:00 committed by GitHub
commit 0268a4869d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
editor/scene_tree_dock.cpp
View File

@ -418,6 +418,8 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
}
}
}
script_create_dialog->connect("script_created", this, "_script_created");
script_create_dialog->connect("popup_hide", this, "_script_creation_closed");
script_create_dialog->config(inherits, path);
script_create_dialog->popup_centered();
@ -1646,6 +1648,11 @@ void SceneTreeDock::_script_created(Ref<Script> p_script) {
_update_script_button();
}
void SceneTreeDock::_script_creation_closed() {
script_create_dialog->disconnect("script_created", this, "_script_created");
script_create_dialog->disconnect("popup_hide", this, "_script_creation_closed");
}
void SceneTreeDock::_toggle_editable_children_from_selection() {
List<Node *> selection = editor_selection->get_selected_node_list();
@ -2505,6 +2512,7 @@ void SceneTreeDock::_bind_methods() {
ClassDB::bind_method(D_METHOD("_node_selected"), &SceneTreeDock::_node_selected);
ClassDB::bind_method(D_METHOD("_node_renamed"), &SceneTreeDock::_node_renamed);
ClassDB::bind_method(D_METHOD("_script_created"), &SceneTreeDock::_script_created);
ClassDB::bind_method(D_METHOD("_script_creation_closed"), &SceneTreeDock::_script_creation_closed);
ClassDB::bind_method(D_METHOD("_load_request"), &SceneTreeDock::_load_request);
ClassDB::bind_method(D_METHOD("_script_open_request"), &SceneTreeDock::_script_open_request);
ClassDB::bind_method(D_METHOD("_unhandled_key_input"), &SceneTreeDock::_unhandled_key_input);
@ -2660,7 +2668,6 @@ SceneTreeDock::SceneTreeDock(EditorNode *p_editor, Node *p_scene_root, EditorSel
script_create_dialog = memnew(ScriptCreateDialog);
script_create_dialog->set_inheritance_base_type("Node");
add_child(script_create_dialog);
script_create_dialog->connect("script_created", this, "_script_created");
reparent_dialog = memnew(ReparentDialog);
add_child(reparent_dialog);

1
editor/scene_tree_dock.h
View File

@ -170,6 +170,7 @@ class SceneTreeDock : public VBoxContainer {
void _node_selected();
void _node_renamed();
void _script_created(Ref<Script> p_script);
void _script_creation_closed();
void _delete_confirm();

4
editor/script_create_dialog.cpp
View File

@ -286,8 +286,8 @@ void ScriptCreateDialog::_create_new() {
}
}
hide();
emit_signal("script_created", scr);
hide();
}
void ScriptCreateDialog::_load_exist() {
@ -300,8 +300,8 @@ void ScriptCreateDialog::_load_exist() {
return;
}
hide();
emit_signal("script_created", p_script.get_ref_ptr());
hide();
}
void ScriptCreateDialog::_lang_changed(int l) {