diff options
| author | Yuri Roubinsky <chaosus89@gmail.com> | 2021-12-09 10:55:13 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-09 10:55:13 +0300 |
| commit | 8ae4960cfd5f019e063bdb261ff451e3e71b0a22 (patch) | |
| tree | 816e7d56ebd63aba95d6284a0232a7529225dbb8 | |
| parent | f1e3c87244f18ab1a507b6e3637c34b2d49c1dc6 (diff) | |
| parent | 3f4728fe54dd15da8802eef2dec86c9ac301782d (diff) | |
Merge pull request #55745 from KoBeWi/commit_farming
| -rw-r--r-- | editor/editor_properties.cpp | 2 | ||||
| -rw-r--r-- | editor/plugins/animation_tree_editor_plugin.cpp | 2 | ||||
| -rw-r--r-- | editor/plugins/tiles/tile_set_atlas_source_editor.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp index 24c229adfd..5ba8dd17f1 100644 --- a/editor/editor_properties.cpp +++ b/editor/editor_properties.cpp @@ -3065,7 +3065,7 @@ void EditorPropertyResource::update_property() { if (res.is_valid() && get_edited_object()->editor_is_section_unfolded(get_edited_property())) { if (!sub_inspector) { sub_inspector = memnew(EditorInspector); - sub_inspector->set_horizontal_scroll_mode(ScrollContainer::SCROLL_MODE_DISABLED); + sub_inspector->set_vertical_scroll_mode(ScrollContainer::SCROLL_MODE_DISABLED); sub_inspector->set_use_doc_hints(true); sub_inspector->set_sub_inspector(true); diff --git a/editor/plugins/animation_tree_editor_plugin.cpp b/editor/plugins/animation_tree_editor_plugin.cpp index 258eb9005f..d65ed9cea2 100644 --- a/editor/plugins/animation_tree_editor_plugin.cpp +++ b/editor/plugins/animation_tree_editor_plugin.cpp @@ -226,7 +226,7 @@ AnimationTreeEditor::AnimationTreeEditor() { AnimationNodeAnimation::get_editable_animation_list = get_animation_list; path_edit = memnew(ScrollContainer); add_child(path_edit); - path_edit->set_horizontal_scroll_mode(ScrollContainer::SCROLL_MODE_DISABLED); + path_edit->set_vertical_scroll_mode(ScrollContainer::SCROLL_MODE_DISABLED); path_hb = memnew(HBoxContainer); path_edit->add_child(path_hb); path_hb->add_child(memnew(Label(TTR("Path:")))); diff --git a/editor/plugins/tiles/tile_set_atlas_source_editor.cpp b/editor/plugins/tiles/tile_set_atlas_source_editor.cpp index 436fea77d7..9a70349a42 100644 --- a/editor/plugins/tiles/tile_set_atlas_source_editor.cpp +++ b/editor/plugins/tiles/tile_set_atlas_source_editor.cpp @@ -2385,7 +2385,7 @@ TileSetAtlasSourceEditor::TileSetAtlasSourceEditor() { atlas_source_inspector = memnew(EditorInspector); atlas_source_inspector->set_undo_redo(undo_redo); - atlas_source_inspector->set_horizontal_scroll_mode(ScrollContainer::SCROLL_MODE_DISABLED); + atlas_source_inspector->set_vertical_scroll_mode(ScrollContainer::SCROLL_MODE_DISABLED); atlas_source_inspector->edit(atlas_source_proxy_object); middle_vbox_container->add_child(atlas_source_inspector); |