improve variable names in new_internal

This commit is contained in:
PgBiel 2025-03-12 21:41:37 -03:00
parent f1eadf7323
commit 88d72a8689

View File

@ -671,14 +671,14 @@ impl<'a> CellGrid<'a> {
let mut rows = vec![]; let mut rows = vec![];
// Number of content columns: Always at least one. // Number of content columns: Always at least one.
let columns = tracks.x.len().max(1); let num_cols = tracks.x.len().max(1);
// Number of content rows: At least as many as given, but also at least // Number of content rows: At least as many as given, but also at least
// as many as needed to place each item. // as many as needed to place each item.
let r = { let num_rows = {
let len = entries.len(); let len = entries.len();
let given = tracks.y.len(); let given = tracks.y.len();
let needed = len / columns + (len % columns).clamp(0, 1); let needed = len / num_cols + (len % num_cols).clamp(0, 1);
given.max(needed) given.max(needed)
}; };
@ -690,7 +690,7 @@ impl<'a> CellGrid<'a> {
}; };
// Collect content and gutter columns. // Collect content and gutter columns.
for x in 0..columns { for x in 0..num_cols {
cols.push(get_or(tracks.x, x, auto)); cols.push(get_or(tracks.x, x, auto));
if has_gutter { if has_gutter {
cols.push(get_or(gutter.x, x, zero)); cols.push(get_or(gutter.x, x, zero));
@ -698,7 +698,7 @@ impl<'a> CellGrid<'a> {
} }
// Collect content and gutter rows. // Collect content and gutter rows.
for y in 0..r { for y in 0..num_rows {
rows.push(get_or(tracks.y, y, auto)); rows.push(get_or(tracks.y, y, auto));
if has_gutter { if has_gutter {
rows.push(get_or(gutter.y, y, zero)); rows.push(get_or(gutter.y, y, zero));