caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-05-15 01:25:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make better use of existing variables in grid

Browse Source
This commit is contained in:
Laurenz 2021-08-21 15:28:44 +02:00
parent f71c38b38d
commit f38eb10c2b
1 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/layout/grid.rs
View File

@ -65,7 +65,7 @@ struct GridLayouter<'a> {
rows: Vec<TrackSizing>, rows: Vec<TrackSizing>,
/// The children of the grid. /// The children of the grid.
children: &'a [LayoutNode], children: &'a [LayoutNode],
/// The region to layout into. /// The regions to layout into.
regions: Regions, regions: Regions,
/// Resolved column sizes. /// Resolved column sizes.
rcols: Vec<Length>, rcols: Vec<Length>,
@ -165,10 +165,14 @@ impl<'a> GridLayouter<'a> {
enum Case { enum Case {
PurelyLinear, PurelyLinear,
Fitting, Fitting,
Overflowing,
Exact, Exact,
Overflowing,
} }
// Generic version of current and base size.
let current = self.regions.current.to_gen(self.main);
let base = self.regions.base.to_gen(self.main);
// The different cases affecting constraints. // The different cases affecting constraints.
let mut case = Case::PurelyLinear; let mut case = Case::PurelyLinear;
@ -178,10 +182,6 @@ impl<'a> GridLayouter<'a> {
// Sum of fractions of all fractional tracks. // Sum of fractions of all fractional tracks.
let mut fr = Fractional::zero(); let mut fr = Fractional::zero();
// Generic version of current and base size.
let current = self.regions.current.to_gen(self.main);
let base = self.regions.base.to_gen(self.main);
// Resolve the size of all linear columns and compute the sum of all // Resolve the size of all linear columns and compute the sum of all
// fractional tracks. // fractional tracks.
for (&col, rcol) in self.cols.iter().zip(&mut self.rcols) { for (&col, rcol) in self.cols.iter().zip(&mut self.rcols) {
@ -190,12 +190,10 @@ impl<'a> GridLayouter<'a> {
case = Case::Fitting; case = Case::Fitting;
} }
TrackSizing::Linear(v) => { TrackSizing::Linear(v) => {
self.constraints.base.set(self.cross, Some(base.cross));
let resolved = v.resolve(base.cross); let resolved = v.resolve(base.cross);
*rcol = resolved; *rcol = resolved;
linear += resolved; linear += resolved;
self.constraints
.base
.set(self.cross, Some(self.regions.base.get(self.cross)));
} }
TrackSizing::Fractional(v) => { TrackSizing::Fractional(v) => {
case = Case::Fitting; case = Case::Fitting;
@ -222,26 +220,20 @@ impl<'a> GridLayouter<'a> {
self.shrink_auto_columns(available, count); self.shrink_auto_columns(available, count);
case = Case::Exact; case = Case::Exact;
} }
} else if let Case::Fitting = case { } else if matches!(case, Case::Fitting) {
case = Case::Overflowing; case = Case::Overflowing;
} }
self.used.cross = self.rcols.iter().sum(); // Set constraints depending on the case we hit.
match case { match case {
Case::PurelyLinear => {} Case::PurelyLinear => {}
Case::Fitting => { Case::Fitting => self.constraints.min.set(self.cross, Some(self.used.cross)),
self.constraints.min.set(self.cross, Some(self.used.cross)); Case::Exact => self.constraints.exact.set(self.cross, Some(current.cross)),
} Case::Overflowing => self.constraints.max.set(self.cross, Some(linear)),
Case::Overflowing => {
self.constraints.max.set(self.cross, Some(linear));
}
Case::Exact => {
self.constraints
.exact
.set(self.cross, Some(self.regions.current.get(self.cross)));
}
} }
// Sum up the resolved column sizes once here.
self.used.cross = self.rcols.iter().sum();
} }
/// Measure the size that is available to auto columns. /// Measure the size that is available to auto columns.