Stowage/ladybird
2
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-12-08 06:09:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

LibWeb: Serialize grid-template shorthand correctly

Browse source
This commit is contained in:
Tim Ledbetter 2025-09-27 18:31:19 +01:00 • committed by Alexander Kalenik
parent cb6ca85564
commit bf1564388d
Notes: github-actions[bot] 2025-09-28 15:36:02 +00:00
5 changed files with 106 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

50
Libraries/LibWeb/CSS/StyleValues/ShorthandStyleValue.cpp
View file

@ -648,27 +648,45 @@ String ShorthandStyleValue::to_string(SerializationMode mode) const
auto construct_rows_string = [&]() {
StringBuilder builder;
size_t idx = 0;
for (auto const& row : rows.grid_track_size_list().track_list()) {
if (areas.grid_template_area().size() > idx) {
builder.append("\""sv);
for (size_t y = 0; y < areas.grid_template_area()[idx].size(); ++y) {
builder.append(areas.grid_template_area()[idx][y]);
if (y != areas.grid_template_area()[idx].size() - 1)
builder.append(" "sv);
}
builder.append("\" "sv);
for (size_t i = 0; i < rows.grid_track_size_list().list().size(); ++i) {
auto track_size_or_line_names = rows.grid_track_size_list().list()[i];
if (auto* line_names = track_size_or_line_names.get_pointer<GridLineNames>()) {
if (i != 0)
builder.append(' ');
builder.append(line_names->to_string());
}
if (areas.grid_template_area().size() > i) {
if (!builder.is_empty())
builder.append(' ');
builder.append("\""sv);
for (size_t y = 0; y < areas.grid_template_area()[i].size(); ++y) {
if (y != 0)
builder.append(' ');
builder.append(areas.grid_template_area()[i][y]);
}
builder.append("\""sv);
}
if (auto* track_size = track_size_or_line_names.get_pointer<ExplicitGridTrack>()) {
auto track_size_serialization = track_size->to_string(mode);
if (track_size_serialization != "auto"sv) {
if (!builder.is_empty())
builder.append(' ');
builder.append(track_size_serialization);
}
}
builder.append(row.to_string(mode));
if (idx < rows.grid_track_size_list().track_list().size() - 1)
builder.append(' ');
idx++;
}
return MUST(builder.to_string());
};
if (columns.grid_track_size_list().track_list().size() == 0)
return MUST(String::formatted("{}", construct_rows_string()));
if (areas.grid_template_area().is_empty())
return MUST(String::formatted("{} / {}", rows.grid_track_size_list().to_string(mode), columns.grid_track_size_list().to_string(mode)));
auto rows_serialization = construct_rows_string();
if (rows_serialization.is_empty())
return String {};
if (columns.grid_track_size_list().is_empty())
return MUST(String::formatted("{}", rows_serialization));
return MUST(String::formatted("{} / {}", construct_rows_string(), columns.grid_track_size_list().to_string(mode)));
}
case PropertyID::GridColumn: {