allow skipping from non-repeated header on lack of space

Can lead to orphans, but without enough space, anything goes.
This commit is contained in:
PgBiel 2025-05-06 03:55:34 -03:00
parent 6a12a451fc
commit 1d217e4019
4 changed files with 12 additions and 16 deletions

View File

@ -1376,14 +1376,13 @@ impl<'a> GridLayouter<'a> {
// endlessly repeated) when subtracting header and footer height. // endlessly repeated) when subtracting header and footer height.
// //
// See 'check_for_unbreakable_rows' as for why we're using // See 'check_for_unbreakable_rows' as for why we're using
// 'header_height' to predict header height and not // 'repeating_header_height' to predict header height.
// 'repeating_header_height'.
let height = frame.height(); let height = frame.height();
while self.unbreakable_rows_left == 0 while self.unbreakable_rows_left == 0
&& !self.regions.size.y.fits(height) && !self.regions.size.y.fits(height)
&& may_progress_with_offset( && may_progress_with_offset(
self.regions, self.regions,
self.current.header_height + self.current.footer_height, self.current.repeating_header_height + self.current.footer_height,
) )
{ {
self.finish_region(engine, false)?; self.finish_region(engine, false)?;
@ -1571,11 +1570,9 @@ impl<'a> GridLayouter<'a> {
&& self.current.lrows.is_empty() && self.current.lrows.is_empty()
&& may_progress_with_offset( && may_progress_with_offset(
self.regions, self.regions,
// This header height isn't doing much as we just // Don't sum header height as we just confirmed that there
// confirmed that there are no headers in this region, // are no headers in this region.
// but let's keep it here for correctness. It will add self.current.footer_height,
// zero anyway.
self.current.header_height + self.current.footer_height,
); );
let mut laid_out_footer_start = None; let mut laid_out_footer_start = None;

View File

@ -377,7 +377,7 @@ impl<'a> GridLayouter<'a> {
// 'header_height == repeating_header_height' here // 'header_height == repeating_header_height' here
// (there won't be any pending headers at this point, other // (there won't be any pending headers at this point, other
// than the ones we are about to place). // than the ones we are about to place).
self.current.header_height + self.current.footer_height, self.current.repeating_header_height + self.current.footer_height,
) )
{ {
// Note that, after the first region skip, the new headers will go // Note that, after the first region skip, the new headers will go
@ -393,7 +393,7 @@ impl<'a> GridLayouter<'a> {
&& self.current.lrows_orphan_snapshot.is_none() && self.current.lrows_orphan_snapshot.is_none()
&& may_progress_with_offset( && may_progress_with_offset(
self.regions, self.regions,
self.current.header_height + self.current.footer_height, self.current.repeating_header_height + self.current.footer_height,
); );
if should_snapshot { if should_snapshot {

View File

@ -258,12 +258,11 @@ impl GridLayouter<'_> {
while !self.regions.size.y.fits(row_group.height) while !self.regions.size.y.fits(row_group.height)
&& may_progress_with_offset( && may_progress_with_offset(
self.regions, self.regions,
// Note that we consider that the exact same headers and footers will be // Use 'repeating_header_height' (ignoring the height of
// added if we skip like this (blocking other rows from being laid out) // non-repeated headers) to allow skipping if the
// due to orphan/widow prevention, which explains the usage of // non-repeated header is too large. It will become an
// 'header_height' (include non-repeating but pending headers) rather // orphan, but when there is no space left, anything goes.
// than 'repeating_header_height'. self.current.repeating_header_height + self.current.footer_height,
self.current.header_height + self.current.footer_height,
) )
{ {
self.finish_region(engine, false)?; self.finish_region(engine, false)?;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 437 B

After

Width:  |  Height:  |  Size: 542 B