diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-04-03 15:53:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-03 15:53:35 +0200 |
| commit | 59d44ee872cc7da1e6f85943b2d08e32c65c01e1 (patch) | |
| tree | 5a9b6fb475d31eee1903a85ee1188b4bfff0e12e /editor/plugins/canvas_item_editor_plugin.cpp | |
| parent | d9a560d7832af7f1ff845ed2b3a81b65741f9abe (diff) | |
| parent | 0c6851ae53c1c7b7aff743d05c658cb28e1af576 (diff) | |
| download | redot-engine-59d44ee872cc7da1e6f85943b2d08e32c65c01e1.tar.gz | |
Merge pull request #37505 from YeldhamDev/viewcont_rename
Rename ViewportContainer to SubViewportContainer
Diffstat (limited to 'editor/plugins/canvas_item_editor_plugin.cpp')
| -rw-r--r-- | editor/plugins/canvas_item_editor_plugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index d8b9fb4d8f..2f7747d0ff 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -48,7 +48,7 @@ #include "scene/2d/touch_screen_button.h" #include "scene/gui/grid_container.h" #include "scene/gui/nine_patch_rect.h" -#include "scene/gui/viewport_container.h" +#include "scene/gui/subviewport_container.h" #include "scene/main/canvas_layer.h" #include "scene/main/window.h" #include "scene/resources/packed_scene.h" @@ -5434,7 +5434,7 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) { viewport_scrollable->set_h_size_flags(Control::SIZE_EXPAND_FILL); viewport_scrollable->connect("draw", callable_mp(this, &CanvasItemEditor::_update_scrollbars)); - ViewportContainer *scene_tree = memnew(ViewportContainer); + SubViewportContainer *scene_tree = memnew(SubViewportContainer); viewport_scrollable->add_child(scene_tree); scene_tree->set_stretch(true); scene_tree->set_anchors_and_margins_preset(Control::PRESET_WIDE); |