RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 05:07:35 +00:00
Code Issues Activity Actions

LibWeb: Some row span fixes when combined with nested tables

Browse source 
Add logic to compute {min, max}-height and use min-height when
calculating table height, per specifications.

Fixes some issues with phylogenetic tree visualizations on Wikipedia.
This commit is contained in:
Andi Gallo 2023-06-08 03:37:26 +00:00 • committed by Andreas Kling
parent 75e87c32f2
commit 6a7a7e2337
4 changed files with 371 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Userland/Libraries/LibWeb/Layout/TableFormattingContext.h
View file

@ -12,6 +12,11 @@
namespace Web::Layout {
enum class TableDimension {
Row,
Column
};
class TableFormattingContext final : public FormattingContext {
public:
explicit TableFormattingContext(LayoutState&, Box const&, FormattingContext* parent);
@ -31,6 +36,8 @@ private:
CSSPixels run_caption_layout(LayoutMode, CSS::CaptionSide);
CSSPixels compute_capmin();
void calculate_row_column_grid(Box const&);
void compute_cell_measures(AvailableSpace const& available_space);
template<class RowOrColumn>
void compute_table_measures();
void compute_table_width();
void distribute_width_to_columns();
@ -46,17 +53,17 @@ private:
Optional<AvailableSpace> m_available_space;
enum class ColumnType {
enum class SizeType {
Percent,
Pixel,
Auto
};
struct Column {
ColumnType type { ColumnType::Auto };
SizeType type { SizeType::Auto };
CSSPixels left_offset { 0 };
CSSPixels min_width { 0 };
CSSPixels max_width { 0 };
CSSPixels min_size { 0 };
CSSPixels max_size { 0 };
CSSPixels used_width { 0 };
double percentage_width { 0 };
};
@ -67,6 +74,10 @@ private:
CSSPixels reference_height { 0 };
CSSPixels final_height { 0 };
CSSPixels baseline { 0 };
SizeType type { SizeType::Auto };
CSSPixels min_size { 0 };
CSSPixels max_size { 0 };
double percentage_height { 0 };
};
struct Cell {
@ -78,8 +89,27 @@ private:
CSSPixels baseline { 0 };
CSSPixels min_width { 0 };
CSSPixels max_width { 0 };
CSSPixels min_height { 0 };
CSSPixels max_height { 0 };
};
// Accessors to enable direction-agnostic table measurement.
template<class RowOrColumn>
static size_t cell_span(Cell const& cell);
template<class RowOrColumn>
static size_t cell_index(Cell const& cell);
template<class RowOrColumn>
static CSSPixels cell_min_size(Cell const& cell);
template<class RowOrColumn>
static CSSPixels cell_max_size(Cell const& cell);
template<class RowOrColumn>
Vector<RowOrColumn>& table_rows_or_columns();
CSSPixels compute_row_content_height(Cell const& cell) const;
enum class ConflictingEdge {