caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-05-14 04:56:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix comments swapped by mistake, and other nits (#4055)

Browse Source
This commit is contained in:
Leedehai 2024-05-07 06:04:46 -04:00 committed by GitHub
parent c49c0955be
commit 182508658d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
crates/typst/src/layout/stack.rs
View File

@ -148,7 +148,7 @@ struct StackLayouter<'a> {
/// The initial size of the current region before we started subtracting. /// The initial size of the current region before we started subtracting.
initial: Size, initial: Size,
/// The generic size used by the frames for the current region. /// The generic size used by the frames for the current region.
used: Gen<Abs>, used: GenericSize<Abs>,
/// The sum of fractions in the current region. /// The sum of fractions in the current region.
fr: Fr, fr: Fr,
/// Already layouted items whose exact positions are not yet known due to /// Already layouted items whose exact positions are not yet known due to
@ -190,7 +190,7 @@ impl<'a> StackLayouter<'a> {
styles, styles,
expand, expand,
initial: regions.size, initial: regions.size,
used: Gen::zero(), used: GenericSize::zero(),
fr: Fr::zero(), fr: Fr::zero(),
items: vec![], items: vec![],
finished: vec![], finished: vec![],
@ -245,18 +245,18 @@ impl<'a> StackLayouter<'a> {
let len = fragment.len(); let len = fragment.len();
for (i, frame) in fragment.into_iter().enumerate() { for (i, frame) in fragment.into_iter().enumerate() {
// Grow our size, shrink the region and save the frame for later. // Grow our size, shrink the region and save the frame for later.
let size = frame.size(); let specific_size = frame.size();
if self.dir.axis() == Axis::Y { if self.dir.axis() == Axis::Y {
self.regions.size.y -= size.y; self.regions.size.y -= specific_size.y;
} }
let gen = match self.axis { let generic_size = match self.axis {
Axis::X => Gen::new(size.y, size.x), Axis::X => GenericSize::new(specific_size.y, specific_size.x),
Axis::Y => Gen::new(size.x, size.y), Axis::Y => GenericSize::new(specific_size.x, specific_size.y),
}; };
self.used.main += gen.main; self.used.main += generic_size.main;
self.used.cross.set_max(gen.cross); self.used.cross.set_max(generic_size.cross);
self.items.push(StackItem::Frame(frame, align)); self.items.push(StackItem::Frame(frame, align));
@ -321,7 +321,7 @@ impl<'a> StackLayouter<'a> {
.get(other) .get(other)
.position(size.get(other) - frame.size().get(other)); .position(size.get(other) - frame.size().get(other));
let pos = Gen::new(cross, main).to_point(self.axis); let pos = GenericSize::new(cross, main).to_point(self.axis);
cursor += child; cursor += child;
output.push_frame(pos, frame); output.push_frame(pos, frame);
} }
@ -331,7 +331,7 @@ impl<'a> StackLayouter<'a> {
// Advance to the next region. // Advance to the next region.
self.regions.next(); self.regions.next();
self.initial = self.regions.size; self.initial = self.regions.size;
self.used = Gen::zero(); self.used = GenericSize::zero();
self.fr = Fr::zero(); self.fr = Fr::zero();
self.finished.push(output); self.finished.push(output);
@ -345,16 +345,17 @@ impl<'a> StackLayouter<'a> {
} }
} }
/// A container with a main and cross component. /// A generic size with main and cross axes. The axes are generic, meaning the
/// main axis could correspond to either the X or the Y axis.
#[derive(Default, Copy, Clone, Eq, PartialEq, Hash)] #[derive(Default, Copy, Clone, Eq, PartialEq, Hash)]
struct Gen<T> { struct GenericSize<T> {
/// The main component. /// The cross component, along the axis perpendicular to the main.
pub cross: T, pub cross: T,
/// The cross component. /// The main component.
pub main: T, pub main: T,
} }
impl<T> Gen<T> { impl<T> GenericSize<T> {
/// Create a new instance from the two components. /// Create a new instance from the two components.
const fn new(cross: T, main: T) -> Self { const fn new(cross: T, main: T) -> Self {
Self { cross, main } Self { cross, main }
@ -369,7 +370,7 @@ impl<T> Gen<T> {
} }
} }
impl Gen<Abs> { impl GenericSize<Abs> {
/// The zero value. /// The zero value.
fn zero() -> Self { fn zero() -> Self {
Self { cross: Abs::zero(), main: Abs::zero() } Self { cross: Abs::zero(), main: Abs::zero() }