aleleba/designcraft
1
0
Fork 0
mirror of https://github.com/storytold/designcraft.git synced 2026-10-27 03:36:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

Group warichu row layout scalars to satisfy S107 parameter limit

Browse Source
This commit is contained in:
Dylan Taylor
2026-10-23 22:54:37 -04:00
parent e660ad9ad0
commit ded88d073b
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/compose/src/warichu.rs
+14 -4
View File
@@ -223,22 +223,32 @@ fn layout(styles: &[RunStyle], line: &mut [PlacedGlyph], members: &[usize]) -> f
// Bounded, so a hostile value can't move a row to an infinite or huge coordinate.
let spacing = if st.warichu_line_spacing.is_finite() { st.warichu_line_spacing.clamp(-16.0 * st.size, 16.0 * st.size) } else { 0.0 };
let gap = if spacing == 0.0 { small } else { (small + spacing).max(0.0) };
position_warichu_rows(line, members, &counts, &widths, block, old_x0, gap, st);
position_warichu_rows(line, members, &counts, &widths, RowLayout { block, x0: old_x0, gap }, st);
let delta = block - old_span;
shift_non_member_glyphs(line, members, &old_xs, old_x0, old_right, delta, scale);
delta
}
#[derive(Clone, Copy)]
struct RowLayout {
block: f64,
x0: f64,
gap: f64,
}
fn position_warichu_rows(
line: &mut [PlacedGlyph],
members: &[usize],
counts: &[usize],
widths: &[f64],
block: f64,
old_x0: f64,
gap: f64,
layout: RowLayout,
st: &RunStyle,
) {
let block = layout.block;
let old_x0 = layout.x0;
let gap = layout.gap;
let rows = counts.len().max(1);
let mut off = 0_usize;
for (li, &c) in counts.iter().enumerate() {