dan/cushy
1
0
Fork 0
mirror of https://github.com/danbulant/cushy synced 2026-09-18 14:03:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing grid gutter calculations

Browse source 
The space for fractional children's gutters was being doubled.
This commit is contained in:
Jonathan Johnson 2023-12-15 13:59:09 -08:00
parent d7d06e41fa
commit b4caa38b83
No known key found for this signature in database
GPG key ID: A66D6A34D6620579
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/widgets/grid.rs
View file

@ -456,14 +456,11 @@ impl GridLayout {
// Measure the weighted children within the remaining space
if self.total_weights > 0 {
let mut needed_gutters = u32::try_from(self.fractional.len()).unwrap_or(u32::MAX);
if !requires_gutter {
needed_gutters -= 1;
if requires_gutter {
remaining -= gutter;
}
let gutters = gutter * needed_gutters;
let space_per_weight =
((remaining.saturating_sub(gutters)) / self.total_weights).floor();
remaining = remaining.saturating_sub(space_per_weight * self.total_weights + gutters);
let space_per_weight = (remaining / self.total_weights).floor();
remaining = remaining.saturating_sub(space_per_weight * self.total_weights);
for (fractional_index, &(id, weight)) in self.fractional.iter().enumerate() {
let index = self.children.index_of_id(id).expect("child not found");
let mut size = space_per_weight * u32::from(weight);