lisyarus/psemek
1
0
Fork 1
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Fix grid_layout size computation in case all rows/columns are minimized

Browse source
This commit is contained in:
Nikita Lisitsa 2022-03-12 18:01:30 +03:00
parent a3cda92f4c
commit e568ecf14c
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libs/ui/source/grid_layout.cpp
View file

@ -180,7 +180,7 @@ namespace psemek::ui
auto const & column_size = row_column_size.second; auto const & column_size = row_column_size.second;
geom::box<float, 2> result{{{0.f, 0.f}, {0.f, 0.f}}}; geom::box<float, 2> result{{{0.f, 0.f}, {0.f, 0.f}}};
geom::box<float, 2> unit = geom::box<float, 2>::full(); geom::box<float, 2> unit{{{0.f, inf}, {0.f, inf}}};
float sum_row_weights = 0.f; float sum_row_weights = 0.f;
float sum_column_weights = 0.f; float sum_column_weights = 0.f;
@ -209,10 +209,18 @@ namespace psemek::ui
sum_column_weights += column_weight_[i]; sum_column_weights += column_weight_[i];
} }
result[1].min += unit[1].min * sum_row_weights; // prevent (inf * 0.f)
result[1].max += unit[1].max * sum_row_weights; if (sum_row_weights > 0.f)
result[0].min += unit[0].min * sum_column_weights; {
result[0].max += unit[0].max * sum_column_weights; result[1].min += unit[1].min * sum_row_weights;
result[1].max += unit[1].max * sum_row_weights;
}
if (sum_column_weights > 0.f)
{
result[0].min += unit[0].min * sum_column_weights;
result[0].max += unit[0].max * sum_column_weights;
}
int const margin_row_count = (std::max<int>(1, row_count()) + (outer_margin_ ? 1 : -1)); int const margin_row_count = (std::max<int>(1, row_count()) + (outer_margin_ ? 1 : -1));
int const margin_column_count = (std::max<int>(1, column_count()) + (outer_margin_ ? 1 : -1)); int const margin_column_count = (std::max<int>(1, column_count()) + (outer_margin_ ? 1 : -1));