godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-06 17:25:19 +00:00
Code Releases Wiki Activity

Merge pull request #113503 from YeldhamDev/its_an_internal_problem_you_see

Browse Source 
Fix `ScrollContainer` ignoring internal nodes added externally
This commit is contained in:
Rémi Verschelde
2025-12-03 14:58:34 +01:00
parent af6e91d3cc ad22add5ca
commit 2ecefada8d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scene/gui/scroll_container.cpp
View File

@@ -46,6 +46,7 @@ Size2 ScrollContainer::get_minimum_size() const {
if (!c) { if (!c) {
continue; continue;
} }
// Ignore the scroll hints.
if (c == h_scroll || c == v_scroll || c == focus_panel) { if (c == h_scroll || c == v_scroll || c == focus_panel) {
continue; continue;
} }
@@ -364,7 +365,7 @@ void ScrollContainer::_reposition_children() {
for (int i = 0; i < get_child_count(); i++) { for (int i = 0; i < get_child_count(); i++) {
Control *c = as_sortable_control(get_child(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; continue;
} }
Size2 minsize = c->get_combined_minimum_size(); 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++) { for (int i = 0; i < get_child_count(); i++) {
Control *c = as_sortable_control(get_child(i), SortableVisibilityMode::VISIBLE); 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; continue;
} }