leyoda/iced-yoda
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix number of rows in grid when evenly distributed (#2896)

Browse source 
* fix number of rows in grid when evenly distributed

* use div_ceil

---------

Co-authored-by: Johann Tuffe <jtuffe@capulaglobal.com>
This commit is contained in:
Johann Tuffe 2025-04-25 07:00:10 +08:00 • committed by GitHub
parent f67785edb5
commit 0231c152fc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
widget/src/grid.rs
View file

@ -193,8 +193,6 @@ where
Constraint::Amount(amount) => amount,
};
let total_rows = self.children.len() / cells_per_row;
let cell_width = (available.width
- self.spacing * (cells_per_row - 1) as f32)
/ cells_per_row as f32;
@ -202,10 +200,13 @@ where
let cell_height = match self.height {
Sizing::AspectRatio(ratio) => Some(cell_width / ratio),
Sizing::EvenlyDistribute(Length::Shrink) => None,
Sizing::EvenlyDistribute(_) => Some(
(available.height - self.spacing * (total_rows - 1) as f32)
/ total_rows as f32,
),
Sizing::EvenlyDistribute(_) => {
let total_rows = self.children.len().div_ceil(cells_per_row);
Some(
(available.height - self.spacing * (total_rows - 1) as f32)
/ total_rows as f32,
)
}
};
let cell_limits = layout::Limits::new(
@ -213,7 +214,7 @@ where
Size::new(cell_width, cell_height.unwrap_or(available.height)),
);
let mut nodes = Vec::new();
let mut nodes = Vec::with_capacity(self.children.len());
let mut x = 0.0;
let mut y = 0.0;
let mut row_height = 0.0f32;