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

Use range iterators for Map

Browse Source
This commit is contained in:
Lightning_A
2021-08-09 14:13:42 -06:00
parent e4dfa69bcf
commit c63b18507d
154 changed files with 1897 additions and 1897 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
scene/gui/grid_container.cpp
View File

@@ -82,15 +82,15 @@ void GridContainer::_notification(int p_what) {
// Evaluate the remaining space for expanded columns/rows.
Size2 remaining_space = get_size();
for (Map<int, int>::Element *E = col_minw.front(); E; E = E->next()) {
if (!col_expanded.has(E->key())) {
remaining_space.width -= E->get();
for (const KeyValue<int, int> &E : col_minw) {
if (!col_expanded.has(E.key)) {
remaining_space.width -= E.value;
}
}
for (Map<int, int>::Element *E = row_minh.front(); E; E = E->next()) {
if (!row_expanded.has(E->key())) {
remaining_space.height -= E->get();
for (const KeyValue<int, int> &E : row_minh) {
if (!row_expanded.has(E.key)) {
remaining_space.height -= E.value;
}
}
remaining_space.height -= vsep * MAX(max_row - 1, 0);
@@ -247,12 +247,12 @@ Size2 GridContainer::get_minimum_size() const {
Size2 ms;
for (Map<int, int>::Element *E = col_minw.front(); E; E = E->next()) {
ms.width += E->get();
for (const KeyValue<int, int> &E : col_minw) {
ms.width += E.value;
}
for (Map<int, int>::Element *E = row_minh.front(); E; E = E->next()) {
ms.height += E->get();
for (const KeyValue<int, int> &E : row_minh) {
ms.height += E.value;
}
ms.height += vsep * max_row;