Merge pull request #3061 from TheHX/pr-tree-dialogs
Double-click item for reparent and choose a node in NodePath dialog
This commit is contained in:
commit
7155f75e22
2 changed files with 10 additions and 11 deletions
|
@ -84,17 +84,19 @@ void ReparentDialog::_bind_methods() {
|
|||
|
||||
ReparentDialog::ReparentDialog() {
|
||||
|
||||
|
||||
set_title("Reparent Node");
|
||||
|
||||
VBoxContainer *vbc = memnew( VBoxContainer );
|
||||
add_child(vbc);
|
||||
set_child_rect(vbc);
|
||||
|
||||
tree = memnew( SceneTreeEditor(false) );
|
||||
|
||||
tree->set_show_enabled_subscene(true);
|
||||
|
||||
vbc->add_margin_child("Reparent Location (Select new Parent):",tree,true);
|
||||
|
||||
tree->get_scene_tree()->connect("item_activated",this,"_reparent");
|
||||
|
||||
//Label *label = memnew( Label );
|
||||
//label->set_pos( Point2( 15,8) );
|
||||
//label->set_text("Reparent Location (Select new Parent):");
|
||||
|
@ -103,10 +105,8 @@ ReparentDialog::ReparentDialog() {
|
|||
add_child(node_only);
|
||||
node_only->hide();
|
||||
|
||||
tree->set_show_enabled_subscene(true);
|
||||
//vbc->add_margin_child("Options:",node_only);;
|
||||
|
||||
|
||||
//cancel->connect("pressed", this,"_cancel");
|
||||
|
||||
get_ok()->set_text("Reparent");
|
||||
|
|
|
@ -939,7 +939,6 @@ void SceneTreeDialog::_bind_methods() {
|
|||
ObjectTypeDB::bind_method("_cancel",&SceneTreeDialog::_cancel);
|
||||
ADD_SIGNAL( MethodInfo("selected",PropertyInfo(Variant::NODE_PATH,"path")));
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
@ -951,7 +950,7 @@ SceneTreeDialog::SceneTreeDialog() {
|
|||
add_child(tree);
|
||||
set_child_rect(tree);
|
||||
|
||||
|
||||
tree->get_scene_tree()->connect("item_activated",this,"_select");
|
||||
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue