From ad22add5caaf24645f5f5a420f7542307542f8bd Mon Sep 17 00:00:00 2001 From: Michael Alexsander Date: Wed, 3 Dec 2025 09:04:58 -0300 Subject: [PATCH] Fix `ScrollContainer` ignoring internal nodes added externally --- scene/gui/scroll_container.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scene/gui/scroll_container.cpp b/scene/gui/scroll_container.cpp index b8e8eef35a6..b8e897f20db 100644 --- a/scene/gui/scroll_container.cpp +++ b/scene/gui/scroll_container.cpp @@ -46,6 +46,7 @@ Size2 ScrollContainer::get_minimum_size() const { if (!c) { continue; } + // Ignore the scroll hints. if (c == h_scroll || c == v_scroll || c == focus_panel) { continue; } @@ -364,7 +365,7 @@ void ScrollContainer::_reposition_children() { for (int i = 0; i < get_child_count(); i++) { Control *c = as_sortable_control(get_child(i)); - if (!c || c->is_internal()) { + if (!c || c == h_scroll || c == v_scroll || c == focus_panel || c == scroll_hint_top_left || c == scroll_hint_bottom_right) { continue; } Size2 minsize = c->get_combined_minimum_size(); @@ -770,7 +771,7 @@ PackedStringArray ScrollContainer::get_configuration_warnings() const { for (int i = 0; i < get_child_count(); i++) { Control *c = as_sortable_control(get_child(i), SortableVisibilityMode::VISIBLE); - if (!c || c->is_internal()) { + if (!c || c == h_scroll || c == v_scroll || c == focus_panel || c == scroll_hint_top_left || c == scroll_hint_bottom_right) { continue; }