godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-03 18:11:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add as_sortable_control() to unify Container checks

Browse Source
This commit is contained in:
kobewi
2024-05-06 12:38:51 +02:00
parent 17a81260cb
commit 5c28814b39
15 changed files with 65 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
scene/gui/flow_container.cpp
View File

@@ -63,11 +63,8 @@ void FlowContainer::_resort() {
// First pass for line wrapping and minimum size calculation.
for (int i = 0; i < get_child_count(); i++) {
Control *child = Object::cast_to<Control>(get_child(i));
if (!child || !child->is_visible()) {
continue;
}
if (child->is_set_as_top_level()) {
Control *child = as_sortable_control(get_child(i));
if (!child) {
continue;
}
@@ -138,11 +135,8 @@ void FlowContainer::_resort() {
ofs.y = 0;
for (int i = 0; i < get_child_count(); i++) {
Control *child = Object::cast_to<Control>(get_child(i));
if (!child || !child->is_visible()) {
continue;
}
if (child->is_set_as_top_level()) {
Control *child = as_sortable_control(get_child(i));
if (!child) {
continue;
}
Size2i child_size = children_minsize_cache[child];
@@ -256,17 +250,10 @@ Size2 FlowContainer::get_minimum_size() const {
Size2i minimum;
for (int i = 0; i < get_child_count(); i++) {
Control *c = Object::cast_to<Control>(get_child(i));
Control *c = as_sortable_control(get_child(i));
if (!c) {
continue;
}
if (c->is_set_as_top_level()) {
continue;
}
if (!c->is_visible()) {
continue;
}
Size2i size = c->get_combined_minimum_size();