Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-11 16:35:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

layout: Fix table geometry when collapsed borders have different sizes (#35122)

Browse source 
Even though when painting the collapsed borders we were using the right
size, when sizing the table we were treating cells as having a border
of half the maximum border size along the entire grid line.

Now we only take the maximum among the borders adjacent to the cell.

Signed-off-by: Oriol Brufau <obrufau@igalia.com>
This commit is contained in:
Oriol Brufau 2025-01-23 03:17:06 -08:00 • committed by GitHub
parent 0af1204aa3
commit 8740c03682
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 121 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

36
components/layout_2020/table/layout.rs
View file

@ -2181,15 +2181,25 @@ impl<'a> TableLayout<'a> {
area: LogicalSides<usize>,
) -> Option<LogicalSides<Au>> {
let collapsed_borders = self.collapsed_borders.as_ref()?;
let inline_start = &collapsed_borders.inline[area.inline_start];
let inline_end = &collapsed_borders.inline[area.inline_end];
let block_start = &collapsed_borders.block[area.block_start];
let block_end = &collapsed_borders.block[area.block_end];
let columns = || area.inline_start..area.inline_end;
let rows = || area.block_start..area.block_end;
let max_width = |slice: &[CollapsedBorder]| {
let slice_widths = slice.iter().map(|collapsed_border| collapsed_border.width);
slice_widths.max().unwrap_or_default()
};
Some(area.map_inline_and_block_axes(
|column| max_width(&collapsed_borders.inline[*column].list[rows()]) / 2,
|row| max_width(&collapsed_borders.block[*row].list[columns()]) / 2,
))
}
fn get_collapsed_border_widths_for_table(&self) -> Option<LogicalSides<Au>> {
let collapsed_borders = self.collapsed_borders.as_ref()?;
Some(LogicalSides {
inline_start: inline_start.max_width / 2,
inline_end: inline_end.max_width / 2,
block_start: block_start.max_width / 2,
block_end: block_end.max_width / 2,
inline_start: collapsed_borders.inline[0].max_width / 2,
inline_end: collapsed_borders.inline[self.table.size.width].max_width / 2,
block_start: collapsed_borders.block[0].max_width / 2,
block_end: collapsed_borders.block[self.table.size.height].max_width / 2,
})
}
}
@ -2705,19 +2715,13 @@ impl TableLayoutStyle<'_> {
pub(crate) fn halved_collapsed_border_widths(&self) -> LogicalSides<Au> {
debug_assert!(self.collapses_borders());
let area = LogicalSides {
inline_start: 0,
inline_end: self.table.size.width,
block_start: 0,
block_end: self.table.size.height,
};
if let Some(layout) = self.layout {
layout.get_collapsed_border_widths_for_area(area)
layout.get_collapsed_border_widths_for_table()
} else {
// TODO: this should be cached.
let mut layout = TableLayout::new(self.table);
layout.compute_border_collapse(self.style().writing_mode);
layout.get_collapsed_border_widths_for_area(area)
layout.get_collapsed_border_widths_for_table()
}
.expect("Collapsed borders should be computed")
}