mirror of
https://github.com/servo/servo.git
synced 2025-08-02 20:20:14 +01:00
Merge pull request #3421 from glennw/table-padding
Fix padding on tables. This fixes the TOC on wikipedia pages.
This commit is contained in:
commit
a3b20d8179
5 changed files with 79 additions and 12 deletions
|
@ -229,9 +229,13 @@ impl Flow for TableFlow {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
let fragment_intrinsic_inline_sizes = self.block_flow.fragment.intrinsic_inline_sizes();
|
||||
self.block_flow.base.intrinsic_inline_sizes.minimum_inline_size = min_inline_size;
|
||||
self.block_flow.base.intrinsic_inline_sizes.preferred_inline_size =
|
||||
geometry::max(min_inline_size, pref_inline_size);
|
||||
self.block_flow.base.intrinsic_inline_sizes.surround_inline_size =
|
||||
fragment_intrinsic_inline_sizes.surround_inline_size;
|
||||
}
|
||||
|
||||
/// Recursively (top-down) determines the actual inline-size of child contexts and fragments. When
|
||||
|
|
|
@ -228,24 +228,26 @@ impl TableWrapper {
|
|||
let mut input = self.compute_inline_size_constraint_inputs(&mut table_wrapper.block_flow,
|
||||
parent_flow_inline_size,
|
||||
ctx);
|
||||
let style = table_wrapper.block_flow.fragment.style();
|
||||
|
||||
// Get inline-start and inline-end paddings, borders for table.
|
||||
// We get these values from the fragment's style since table_wrapper doesn't have it's own border or padding.
|
||||
// input.available_inline-size is same as containing_block_inline-size in table_wrapper.
|
||||
let padding = style.logical_padding();
|
||||
let border = style.logical_border_width();
|
||||
let padding_and_borders =
|
||||
specified(padding.inline_start, input.available_inline_size) +
|
||||
specified(padding.inline_end, input.available_inline_size) +
|
||||
border.inline_start +
|
||||
border.inline_end;
|
||||
|
||||
let computed_inline_size = match table_wrapper.table_layout {
|
||||
FixedLayout => {
|
||||
let fixed_cells_inline_size = table_wrapper.col_inline_sizes.iter().fold(Au(0),
|
||||
|sum, inline_size| sum.add(inline_size));
|
||||
|
||||
let mut computed_inline_size = input.computed_inline_size.specified_or_zero();
|
||||
let style = table_wrapper.block_flow.fragment.style();
|
||||
|
||||
// Get inline-start and inline-end paddings, borders for table.
|
||||
// We get these values from the fragment's style since table_wrapper doesn't have it's own border or padding.
|
||||
// input.available_inline-size is same as containing_block_inline-size in table_wrapper.
|
||||
let padding = style.logical_padding();
|
||||
let border = style.logical_border_width();
|
||||
let padding_and_borders =
|
||||
specified(padding.inline_start, input.available_inline_size) +
|
||||
specified(padding.inline_end, input.available_inline_size) +
|
||||
border.inline_start +
|
||||
border.inline_end;
|
||||
// Compare border-edge inline-sizes. Because fixed_cells_inline-size indicates content-inline-size,
|
||||
// padding and border values are added to fixed_cells_inline-size.
|
||||
computed_inline_size = geometry::max(
|
||||
|
@ -308,7 +310,7 @@ impl TableWrapper {
|
|||
inline_size + extra_inline_size.scale_by(1.0 / cell_len)
|
||||
}).collect();
|
||||
}
|
||||
inline_size
|
||||
inline_size + padding_and_borders
|
||||
}
|
||||
};
|
||||
input.computed_inline_size = Specified(computed_inline_size);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue