Skip to content

Use iterate_children() in Container nodes #118105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KoBeWi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use iterate_children() in Container nodes #118105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions scene/gui/aspect_ratio_container.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@

Size2 AspectRatioContainer::get_minimum_size() const {
Size2 ms;
for (int i = 0; i < get_child_count(); i++) {
Control *c = as_sortable_control(get_child(i), SortableVisibilityMode::VISIBLE);
for (Node *child : iterate_children()) {
Control *c = as_sortable_control(child, SortableVisibilityMode::VISIBLE);
if (!c) {
continue;
}
Expand Down Expand Up @@ -101,8 +101,8 @@ void AspectRatioContainer::_notification(int p_what) {
case NOTIFICATION_SORT_CHILDREN: {
bool rtl = is_layout_rtl();
Size2 size = get_size();
for (int i = 0; i < get_child_count(); i++) {
Control *c = as_sortable_control(get_child(i));
for (Node *child : iterate_children()) {
Control *c = as_sortable_control(child);
if (!c) {
continue;
}
Expand Down
4 changes: 2 additions & 2 deletions scene/gui/box_container.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ void BoxContainer::_resort() {
float stretch_ratio_total = 0.0;
HashMap<Control *, _MinSizeCache> min_size_cache;

for (int i = 0; i < get_child_count(); i++) {
Control *c = as_sortable_control(get_child(i));
for (Node *child : iterate_children()) {
Control *c = as_sortable_control(child);
if (!c) {
continue;
}
Expand Down
8 changes: 4 additions & 4 deletions scene/gui/center_container.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ Size2 CenterContainer::get_minimum_size() const {
return Size2();
}
Size2 ms;
for (int i = 0; i < get_child_count(); i++) {
Control *c = as_sortable_control(get_child(i), SortableVisibilityMode::VISIBLE);
for (Node *child : iterate_children()) {
Control *c = as_sortable_control(child, SortableVisibilityMode::VISIBLE);
if (!c) {
continue;
}
Expand Down Expand Up @@ -76,8 +76,8 @@ void CenterContainer::_notification(int p_what) {
switch (p_what) {
case NOTIFICATION_SORT_CHILDREN: {
Size2 size = get_size();
for (int i = 0; i < get_child_count(); i++) {
Control *c = as_sortable_control(get_child(i));
for (Node *child : iterate_children()) {
Control *c = as_sortable_control(child);
if (!c) {
continue;
}
Expand Down
12 changes: 6 additions & 6 deletions scene/gui/flow_container.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ void FlowContainer::_resort() {
Control *last_child = nullptr;

// First pass for line wrapping and minimum size calculation.
for (int i = 0; i < get_child_count(); i++) {
Control *child = as_sortable_control(get_child(i));
for (Node *childn : iterate_children()) {
Control *child = as_sortable_control(childn);
if (!child) {
continue;
}
Expand Down Expand Up @@ -136,8 +136,8 @@ void FlowContainer::_resort() {
ofs.x = 0;
ofs.y = 0;

for (int i = 0; i < get_child_count(); i++) {
Control *child = as_sortable_control(get_child(i));
for (Node *childn : iterate_children()) {
Control *child = as_sortable_control(childn);
if (!child) {
continue;
}
Expand Down Expand Up @@ -268,8 +268,8 @@ void FlowContainer::_resort() {
Size2 FlowContainer::get_minimum_size() const {
Size2i minimum;

for (int i = 0; i < get_child_count(); i++) {
Control *c = as_sortable_control(get_child(i), SortableVisibilityMode::VISIBLE);
for (Node *child : iterate_children()) {
Control *c = as_sortable_control(child, SortableVisibilityMode::VISIBLE);
if (!c) {
continue;
}
Expand Down
4 changes: 2 additions & 2 deletions scene/gui/foldable_container.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ Size2 FoldableContainer::get_minimum_size() const {
}
Size2 ms;

for (int i = 0; i < get_child_count(); i++) {
Control *c = as_sortable_control(get_child(i));
for (Node *child : iterate_children()) {
Control *c = as_sortable_control(child);
if (!c) {
continue;
}
Expand Down
8 changes: 4 additions & 4 deletions scene/gui/graph_element.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ void GraphElement::_edit_set_position(const Point2 &p_position) {
void GraphElement::_resort() {
Size2 size = get_size();

for (int i = 0; i < get_child_count(); i++) {
Control *child = as_sortable_control(get_child(i));
for (Node *childn : iterate_children()) {
Control *child = as_sortable_control(childn);
if (!child) {
continue;
}
Expand All @@ -60,8 +60,8 @@ void GraphElement::_resort() {

Size2 GraphElement::get_minimum_size() const {
Size2 minsize;
for (int i = 0; i < get_child_count(); i++) {
Control *child = as_sortable_control(get_child(i), SortableVisibilityMode::IGNORE);
for (Node *childn : iterate_children()) {
Control *child = as_sortable_control(childn, SortableVisibilityMode::IGNORE);
if (!child) {
continue;
}
Expand Down
12 changes: 6 additions & 6 deletions scene/gui/grid_container.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ void GridContainer::_notification(int p_what) {

// Compute the per-column/per-row data.
int valid_controls_index = 0;
for (int i = 0; i < get_child_count(); i++) {
Control *c = as_sortable_control(get_child(i));
for (Node *child : iterate_children()) {
Control *c = as_sortable_control(child);
if (!c) {
continue;
}
Expand Down Expand Up @@ -184,8 +184,8 @@ void GridContainer::_notification(int p_what) {
}

valid_controls_index = 0;
for (int i = 0; i < get_child_count(); i++) {
Control *c = as_sortable_control(get_child(i));
for (Node *child : iterate_children()) {
Control *c = as_sortable_control(child);
if (!c) {
continue;
}
Expand Down Expand Up @@ -280,8 +280,8 @@ Size2 GridContainer::get_minimum_size() const {
int max_col = 0;

int valid_controls_index = 0;
for (int i = 0; i < get_child_count(); i++) {
Control *c = as_sortable_control(get_child(i), SortableVisibilityMode::VISIBLE);
for (Node *child : iterate_children()) {
Control *c = as_sortable_control(child, SortableVisibilityMode::VISIBLE);
if (!c) {
continue;
}
Expand Down
8 changes: 4 additions & 4 deletions scene/gui/margin_container.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
Size2 MarginContainer::get_minimum_size() const {
Size2 max;

for (int i = 0; i < get_child_count(); i++) {
Control *c = as_sortable_control(get_child(i), SortableVisibilityMode::VISIBLE);
for (Node *child : iterate_children()) {
Control *c = as_sortable_control(child, SortableVisibilityMode::VISIBLE);
if (!c) {
continue;
}
Expand Down Expand Up @@ -96,8 +96,8 @@ void MarginContainer::_notification(int p_what) {
case NOTIFICATION_SORT_CHILDREN: {
Size2 s = get_size();

for (int i = 0; i < get_child_count(); i++) {
Control *c = as_sortable_control(get_child(i));
for (Node *child : iterate_children()) {
Control *c = as_sortable_control(child);
if (!c) {
continue;
}
Expand Down
8 changes: 4 additions & 4 deletions scene/gui/panel_container.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@

Size2 PanelContainer::get_minimum_size() const {
Size2 ms;
for (int i = 0; i < get_child_count(); i++) {
Control *c = as_sortable_control(get_child(i), SortableVisibilityMode::VISIBLE);
for (Node *child : iterate_children()) {
Control *c = as_sortable_control(child, SortableVisibilityMode::VISIBLE);
if (!c) {
continue;
}
Expand Down Expand Up @@ -83,8 +83,8 @@ void PanelContainer::_notification(int p_what) {
ofs += theme_cache.panel_style->get_offset();
}

for (int i = 0; i < get_child_count(); i++) {
Control *c = as_sortable_control(get_child(i));
for (Node *child : iterate_children()) {
Control *c = as_sortable_control(child);
if (!c) {
continue;
}
Expand Down
12 changes: 6 additions & 6 deletions scene/gui/scroll_container.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ Size2 ScrollContainer::get_minimum_size() const {
// and needs to be calculated before being used by `_update_scrollbars()`.
largest_child_min_size = Size2();

for (int i = 0; i < get_child_count(); i++) {
Control *c = as_sortable_control(get_child(i), SortableVisibilityMode::VISIBLE);
for (Node *child : iterate_children()) {
Control *c = as_sortable_control(child, SortableVisibilityMode::VISIBLE);
if (!c || c == h_scroll || c == v_scroll || c == focus_panel || c == scroll_hint_top_left || c == scroll_hint_bottom_right) {
continue;
}
Expand Down Expand Up @@ -367,8 +367,8 @@ void ScrollContainer::_reposition_children() {
}
}

for (int i = 0; i < get_child_count(); i++) {
Control *c = as_sortable_control(get_child(i));
for (Node *child : iterate_children()) {
Control *c = as_sortable_control(child);
if (!c || c == h_scroll || c == v_scroll || c == focus_panel || c == scroll_hint_top_left || c == scroll_hint_bottom_right) {
continue;
}
Expand Down Expand Up @@ -788,8 +788,8 @@ PackedStringArray ScrollContainer::get_configuration_warnings() const {

int found = 0;

for (int i = 0; i < get_child_count(); i++) {
Control *c = as_sortable_control(get_child(i), SortableVisibilityMode::VISIBLE);
for (Node *child : iterate_children()) {
Control *c = as_sortable_control(child, SortableVisibilityMode::VISIBLE);
if (!c || c == h_scroll || c == v_scroll || c == focus_panel || c == scroll_hint_top_left || c == scroll_hint_bottom_right) {
continue;
}
Expand Down
28 changes: 14 additions & 14 deletions scene/gui/subviewport_container.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ Size2 SubViewportContainer::get_minimum_size() const {
return Size2();
}
Size2 ms;
for (int i = 0; i < get_child_count(); i++) {
SubViewport *c = Object::cast_to<SubViewport>(get_child(i));
for (Node *child : iterate_children()) {
SubViewport *c = Object::cast_to<SubViewport>(child);
if (!c) {
continue;
}
Expand Down Expand Up @@ -86,8 +86,8 @@ void SubViewportContainer::recalc_force_viewport_sizes() {
}

// If stretch is enabled, make sure that all child SubViwewports have the correct size.
for (int i = 0; i < get_child_count(); i++) {
SubViewport *c = Object::cast_to<SubViewport>(get_child(i));
for (Node *child : iterate_children()) {
SubViewport *c = Object::cast_to<SubViewport>(child);
if (!c) {
continue;
}
Expand Down Expand Up @@ -116,8 +116,8 @@ void SubViewportContainer::_notification(int p_what) {

case NOTIFICATION_ENTER_TREE:
case NOTIFICATION_VISIBILITY_CHANGED: {
for (int i = 0; i < get_child_count(); i++) {
SubViewport *c = Object::cast_to<SubViewport>(get_child(i));
for (Node *child : iterate_children()) {
SubViewport *c = Object::cast_to<SubViewport>(child);
if (!c) {
continue;
}
Expand All @@ -133,8 +133,8 @@ void SubViewportContainer::_notification(int p_what) {
} break;

case NOTIFICATION_DRAW: {
for (int i = 0; i < get_child_count(); i++) {
SubViewport *c = Object::cast_to<SubViewport>(get_child(i));
for (Node *child : iterate_children()) {
SubViewport *c = Object::cast_to<SubViewport>(child);
if (!c) {
continue;
}
Expand Down Expand Up @@ -162,8 +162,8 @@ void SubViewportContainer::_notification(int p_what) {
}

void SubViewportContainer::_notify_viewports(int p_notification) {
for (int i = 0; i < get_child_count(); i++) {
SubViewport *c = Object::cast_to<SubViewport>(get_child(i));
for (Node *child : iterate_children()) {
SubViewport *c = Object::cast_to<SubViewport>(child);
if (!c) {
continue;
}
Expand Down Expand Up @@ -228,8 +228,8 @@ void SubViewportContainer::gui_input(const Ref<InputEvent> &p_event) {
}

void SubViewportContainer::_send_event_to_viewports(const Ref<InputEvent> &p_event) {
for (int i = 0; i < get_child_count(); i++) {
SubViewport *c = Object::cast_to<SubViewport>(get_child(i));
for (Node *child : iterate_children()) {
SubViewport *c = Object::cast_to<SubViewport>(child);
if (!c || c->is_input_disabled()) {
continue;
}
Expand Down Expand Up @@ -271,8 +271,8 @@ PackedStringArray SubViewportContainer::get_configuration_warnings() const {
PackedStringArray warnings = Container::get_configuration_warnings();

bool has_viewport = false;
for (int i = 0; i < get_child_count(); i++) {
if (Object::cast_to<SubViewport>(get_child(i))) {
for (Node *child : iterate_children()) {
if (Object::cast_to<SubViewport>(child)) {
has_viewport = true;
break;
}
Expand Down
3 changes: 1 addition & 2 deletions scene/gui/tab_container.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,7 @@ void TabContainer::_notification(int p_what) {

int tab_index = 0;
int tab_cur = tab_bar->get_current_tab();
for (int i = 0; i < get_child_count(); i++) {
Node *child_node = get_child(i);
for (Node *child_node : iterate_children()) {
Window *child_wnd = Object::cast_to<Window>(child_node);
if (child_wnd && !child_wnd->is_embedded()) {
continue;
Expand Down
Loading