diff options
| author | Rémi Verschelde | 2015-12-14 13:22:35 +0100 |
|---|---|---|
| committer | Rémi Verschelde | 2015-12-14 13:22:35 +0100 |
| commit | c262becd7bb87fc17e5a4d3b737c13682855da1a (patch) | |
| tree | 56504413cc7f1d51bd20e84f8f85b454e0045250 /tools/editor/editor_sub_scene.cpp | |
| parent | 7155f75e2224543e036aeed8fa247ef1b96af7e4 (diff) | |
| parent | 12bfb55c6ce07ec81c8c886444a56c8ba3163c2c (diff) | |
| download | godot-c262becd7bb87fc17e5a4d3b737c13682855da1a.tar.gz godot-c262becd7bb87fc17e5a4d3b737c13682855da1a.tar.zst godot-c262becd7bb87fc17e5a4d3b737c13682855da1a.zip | |
Merge pull request #3073 from TheHX/pr-editor-dialogs
Implement double-click on remaining dialogs
Diffstat (limited to 'tools/editor/editor_sub_scene.cpp')
| -rw-r--r-- | tools/editor/editor_sub_scene.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tools/editor/editor_sub_scene.cpp b/tools/editor/editor_sub_scene.cpp index 2a6eba255..d7d79e5cc 100644 --- a/tools/editor/editor_sub_scene.cpp +++ b/tools/editor/editor_sub_scene.cpp @@ -196,7 +196,11 @@ void EditorSubScene::_bind_methods() { EditorSubScene::EditorSubScene() { + scene=NULL; + set_title("Select Sub-Scene.."); + set_hide_on_ok(false); + VBoxContainer *vb = memnew( VBoxContainer ); add_child(vb); set_child_rect(vb); @@ -211,9 +215,11 @@ EditorSubScene::EditorSubScene() { hb->add_child(b); b->connect("pressed",this,"_path_browse"); vb->add_margin_child("Scene Path:",hb); + tree = memnew( Tree ); tree->set_v_size_flags(SIZE_EXPAND_FILL); - vb->add_margin_child("Import From Node:",tree)->set_v_size_flags(SIZE_EXPAND_FILL); + vb->add_margin_child("Import From Node:",tree,true); + tree->connect("item_activated",this,"_ok"); file_dialog = memnew( EditorFileDialog ); List<String> extensions; @@ -228,8 +234,4 @@ EditorSubScene::EditorSubScene() { add_child(file_dialog); file_dialog->connect("file_selected",this,"_path_selected"); - scene=NULL; - - set_hide_on_ok(false); - } |