Skip to content
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

Jump to bottom

SceneTreeDock will now only attach scripts to the selected node if the ScriptCreateDialog was opened from the SceneTreeDock #30196

Merged
merged 2 commits into from
Jul 1, 2019
Merged

SceneTreeDock will now only attach scripts to the selected node if the ScriptCreateDialog was opened from the SceneTreeDock #30196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4961db8
ScriptCreateDialog should emit the script_changed signal first
LikeLakers2 Jun 29, 2019
410054d
SceneTreeDock will now only attach scripts to the selected node if th…
LikeLakers2 Jun 30, 2019
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
9 changes: 8 additions & 1 deletion editor/scene_tree_dock.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -1647,6 +1649,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();
Expand Down Expand Up @@ -2506,6 +2513,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);
Expand Down Expand Up @@ -2661,7 +2669,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);
Expand Down
1 change: 1 addition & 0 deletions editor/scene_tree_dock.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
4 changes: 2 additions & 2 deletions editor/script_create_dialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,8 @@ void ScriptCreateDialog::_create_new() {
}
}

hide();
emit_signal("script_created", scr);
hide();
}

void ScriptCreateDialog::_load_exist() {
Expand All @@ -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) {
Expand Down