diff options
author | Juan Linietsky <reduzio@gmail.com> | 2017-01-10 01:49:55 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2017-01-10 01:49:55 -0300 |
commit | 48097f6df364b040848fb8963f15738d760a72ed (patch) | |
tree | 8816df759d41837fb333bb4a0c7515e89f00e3d0 /tools/editor/plugins | |
parent | a503f8aadcb8cbc85bde589fb25ea06e599b367b (diff) |
Removed the set_child_rect() in AcceptDialog. AcceptDialog now works as a container!
Diffstat (limited to 'tools/editor/plugins')
11 files changed, 13 insertions, 13 deletions
diff --git a/tools/editor/plugins/animation_player_editor_plugin.cpp b/tools/editor/plugins/animation_player_editor_plugin.cpp index 726ff57b9b..3201db1116 100644 --- a/tools/editor/plugins/animation_player_editor_plugin.cpp +++ b/tools/editor/plugins/animation_player_editor_plugin.cpp @@ -1477,7 +1477,7 @@ AnimationPlayerEditor::AnimationPlayerEditor(EditorNode *p_editor) { blend_editor.dialog->set_hide_on_ok(true); VBoxContainer *blend_vb = memnew( VBoxContainer); blend_editor.dialog->add_child(blend_vb); - blend_editor.dialog->set_child_rect(blend_vb); + //blend_editor.dialog->set_child_rect(blend_vb); blend_editor.tree = memnew( Tree ); blend_editor.tree->set_columns(2); blend_vb->add_margin_child(TTR("Blend Times:"),blend_editor.tree,true); diff --git a/tools/editor/plugins/animation_tree_editor_plugin.cpp b/tools/editor/plugins/animation_tree_editor_plugin.cpp index 378265ace8..3b28e8610b 100644 --- a/tools/editor/plugins/animation_tree_editor_plugin.cpp +++ b/tools/editor/plugins/animation_tree_editor_plugin.cpp @@ -1473,7 +1473,7 @@ AnimationTreeEditor::AnimationTreeEditor() { filter = memnew( Tree ); filter_dialog->add_child(filter); - filter_dialog->set_child_rect(filter); + //filter_dialog->set_child_rect(filter); filter->connect("item_edited",this,"_filter_edited"); filter_button = memnew( Button ); diff --git a/tools/editor/plugins/canvas_item_editor_plugin.cpp b/tools/editor/plugins/canvas_item_editor_plugin.cpp index 6839326886..531be2d195 100644 --- a/tools/editor/plugins/canvas_item_editor_plugin.cpp +++ b/tools/editor/plugins/canvas_item_editor_plugin.cpp @@ -79,7 +79,7 @@ public: container = memnew( VBoxContainer ); add_child(container); - set_child_rect(container); + // set_child_rect(container); child_container = memnew( GridContainer ); child_container->set_columns(3); diff --git a/tools/editor/plugins/item_list_editor_plugin.cpp b/tools/editor/plugins/item_list_editor_plugin.cpp index d519ce43ca..f31074a9dc 100644 --- a/tools/editor/plugins/item_list_editor_plugin.cpp +++ b/tools/editor/plugins/item_list_editor_plugin.cpp @@ -309,7 +309,7 @@ ItemListEditor::ItemListEditor() { VBoxContainer *vbc = memnew( VBoxContainer ); dialog->add_child(vbc); - dialog->set_child_rect(vbc); + //dialog->set_child_rect(vbc); HBoxContainer *hbc = memnew( HBoxContainer ); hbc->set_h_size_flags(SIZE_EXPAND_FILL); diff --git a/tools/editor/plugins/mesh_instance_editor_plugin.cpp b/tools/editor/plugins/mesh_instance_editor_plugin.cpp index 164879c4b8..de29991057 100644 --- a/tools/editor/plugins/mesh_instance_editor_plugin.cpp +++ b/tools/editor/plugins/mesh_instance_editor_plugin.cpp @@ -249,7 +249,7 @@ MeshInstanceEditor::MeshInstanceEditor() { VBoxContainer *outline_dialog_vbc = memnew( VBoxContainer ); outline_dialog->add_child(outline_dialog_vbc); - outline_dialog->set_child_rect(outline_dialog_vbc); + //outline_dialog->set_child_rect(outline_dialog_vbc); outline_size = memnew( SpinBox ); outline_size->set_min(0.001); diff --git a/tools/editor/plugins/multimesh_editor_plugin.cpp b/tools/editor/plugins/multimesh_editor_plugin.cpp index d4073bd0c2..b27a66c5f5 100644 --- a/tools/editor/plugins/multimesh_editor_plugin.cpp +++ b/tools/editor/plugins/multimesh_editor_plugin.cpp @@ -341,7 +341,7 @@ MultiMeshEditor::MultiMeshEditor() { VBoxContainer *vbc = memnew( VBoxContainer ); populate_dialog->add_child(vbc); - populate_dialog->set_child_rect(vbc); + //populate_dialog->set_child_rect(vbc); HBoxContainer *hbc = memnew( HBoxContainer ); diff --git a/tools/editor/plugins/polygon_2d_editor_plugin.cpp b/tools/editor/plugins/polygon_2d_editor_plugin.cpp index cde6912a17..ebff3f3130 100644 --- a/tools/editor/plugins/polygon_2d_editor_plugin.cpp +++ b/tools/editor/plugins/polygon_2d_editor_plugin.cpp @@ -853,7 +853,7 @@ Polygon2DEditor::Polygon2DEditor(EditorNode *p_editor) { VBoxContainer *uv_main_vb = memnew( VBoxContainer ); uv_edit->add_child(uv_main_vb); - uv_edit->set_child_rect(uv_main_vb); + //uv_edit->set_child_rect(uv_main_vb); HBoxContainer *uv_mode_hb = memnew( HBoxContainer ); uv_main_vb->add_child(uv_mode_hb); for(int i=0;i<UV_MODE_MAX;i++) { diff --git a/tools/editor/plugins/script_editor_plugin.cpp b/tools/editor/plugins/script_editor_plugin.cpp index 039b1b3307..e167ba2d56 100644 --- a/tools/editor/plugins/script_editor_plugin.cpp +++ b/tools/editor/plugins/script_editor_plugin.cpp @@ -254,7 +254,7 @@ ScriptEditorQuickOpen::ScriptEditorQuickOpen() { VBoxContainer *vbc = memnew( VBoxContainer ); add_child(vbc); - set_child_rect(vbc); + //set_child_rect(vbc); search_box = memnew( LineEdit ); vbc->add_margin_child(TTR("Search:"),search_box); search_box->connect("text_changed",this,"_text_changed"); @@ -2247,7 +2247,7 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) { { VBoxContainer *vbc = memnew( VBoxContainer ); disk_changed->add_child(vbc); - disk_changed->set_child_rect(vbc); + // disk_changed->set_child_rect(vbc); Label *dl = memnew( Label ); dl->set_text(TTR("The following files are newer on disk.\nWhat action should be taken?:")); diff --git a/tools/editor/plugins/script_text_editor.cpp b/tools/editor/plugins/script_text_editor.cpp index ba628b0985..391578817a 100644 --- a/tools/editor/plugins/script_text_editor.cpp +++ b/tools/editor/plugins/script_text_editor.cpp @@ -1280,7 +1280,7 @@ ScriptTextEditor::ScriptTextEditor() { add_child(color_panel); color_picker = memnew(ColorPicker); color_panel->add_child(color_picker); - color_panel->set_child_rect(color_picker); + color_panel->set_child_rect(color_picker); //NOT color_picker->connect("color_changed", this, "_color_changed"); edit_hb = memnew (HBoxContainer); diff --git a/tools/editor/plugins/shader_graph_editor_plugin.cpp b/tools/editor/plugins/shader_graph_editor_plugin.cpp index 3ba405cdbd..2ff9f94d99 100644 --- a/tools/editor/plugins/shader_graph_editor_plugin.cpp +++ b/tools/editor/plugins/shader_graph_editor_plugin.cpp @@ -310,7 +310,7 @@ GraphColorRampEdit::GraphColorRampEdit(){ popup = memnew( PopupPanel ); picker = memnew( ColorPicker ); popup->add_child(picker); - popup->set_child_rect(picker); + /popup->set_child_rect(picker); add_child(popup); } diff --git a/tools/editor/plugins/spatial_editor_plugin.cpp b/tools/editor/plugins/spatial_editor_plugin.cpp index 2897723f29..5b60e4fe05 100644 --- a/tools/editor/plugins/spatial_editor_plugin.cpp +++ b/tools/editor/plugins/spatial_editor_plugin.cpp @@ -3979,7 +3979,7 @@ SpatialEditor::SpatialEditor(EditorNode *p_editor) { VBoxContainer *snap_dialog_vbc = memnew( VBoxContainer ); snap_dialog->add_child(snap_dialog_vbc); - snap_dialog->set_child_rect(snap_dialog_vbc); + //snap_dialog->set_child_rect(snap_dialog_vbc); snap_translate = memnew( LineEdit ); snap_translate->set_text("1"); @@ -4001,7 +4001,7 @@ SpatialEditor::SpatialEditor(EditorNode *p_editor) { settings_vbc = memnew( VBoxContainer ); settings_vbc->set_custom_minimum_size(Size2(200,0)); settings_dialog->add_child(settings_vbc); - settings_dialog->set_child_rect(settings_vbc); + //settings_dialog->set_child_rect(settings_vbc); |