srctree

Robin Linden parent 282b4849 eff19dbf
layout: Include the font weight in calls to text measuring

inlinesplit
layout/layout.cpp added: 49, removed: 10, total 39
@@ -213,6 +213,14 @@ void Layouter::layout(LayoutBox &box, geom::Rect const &bounds) const {
}
}
 
type::Weight to_type(std::optional<style::FontWeight> const &weight) {
if (!weight || weight->value < style::FontWeight::kBold) {
return type::Weight::Normal;
}
 
return type::Weight::Bold;
}
 
void Layouter::layout_inline(LayoutBox &box, geom::Rect const &bounds) const {
assert(box.node);
auto font_size = box.get_property<css::PropertyId::FontSize>();
@@ -221,13 +229,13 @@ void Layouter::layout_inline(LayoutBox &box, geom::Rect const &bounds) const {
 
auto font_families = box.get_property<css::PropertyId::FontFamily>();
if (auto text = box.text()) {
auto weight = to_type(box.get_property<css::PropertyId::FontWeight>());
auto font = find_font(font_families);
if (font) {
box.dimensions.content.width = (*font)->measure(*text, type::Px{font_size}, type::Weight::Normal).width;
box.dimensions.content.width = (*font)->measure(*text, type::Px{font_size}, weight).width;
} else {
spdlog::warn("No font found for font-families: {}", fmt::join(font_families, ", "));
box.dimensions.content.width =
type::NaiveFont{}.measure(*text, type::Px{font_size}, type::Weight::Normal).width;
box.dimensions.content.width = type::NaiveFont{}.measure(*text, type::Px{font_size}, weight).width;
}
}
 
@@ -276,6 +284,9 @@ void Layouter::layout_anonymous_block(LayoutBox &box, geom::Rect const &bounds)
}
auto font = *maybe_font;
 
auto weight =
to_type(!box.children.empty() ? box.children[0].get_property<css::PropertyId::FontWeight>() : std::nullopt);
 
for (std::size_t i = 0; i < box.children.size(); ++i) {
auto *child = &box.children[i];
layout(*child, box.dimensions.content.translated(last_child_end, current_line * font_size.v));
@@ -286,8 +297,7 @@ void Layouter::layout_anonymous_block(LayoutBox &box, geom::Rect const &bounds)
std::size_t best_split_point = std::string_view::npos;
for (auto split_point = text->find(' '); split_point != std::string_view::npos;
split_point = text->find(' ', split_point + 1)) {
if (last_child_end
+ font->measure(text->substr(0, split_point), font_size, type::Weight::Normal).width
if (last_child_end + font->measure(text->substr(0, split_point), font_size, weight).width
> bounds.width) {
break;
}
@@ -297,7 +307,7 @@ void Layouter::layout_anonymous_block(LayoutBox &box, geom::Rect const &bounds)
 
if (best_split_point != std::string_view::npos) {
child->dimensions.content.width =
font->measure(text->substr(0, best_split_point), font_size, type::Weight::Normal).width;
font->measure(text->substr(0, best_split_point), font_size, weight).width;
auto bonus_child = *child;
bonus_child.layout_text = std::string{text->substr(best_split_point + 1)};
box.children.insert(box.children.begin() + i + 1, std::move(bonus_child));
@@ -308,7 +318,7 @@ void Layouter::layout_anonymous_block(LayoutBox &box, geom::Rect const &bounds)
child = &box.children[i];
child->layout_text = std::string{text->substr(0, best_split_point)};
} else {
child->dimensions.content.width = font->measure(*text, font_size, type::Weight::Normal).width;
child->dimensions.content.width = font->measure(*text, font_size, weight).width;
last_child_end += child->dimensions.margin_box().width;
}
}
 
layout/layout_test.cpp added: 49, removed: 10, total 39
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2021-2023 Robin Lindén <dev@robinlinden.eu>
// SPDX-FileCopyrightText: 2021-2024 Robin Lindén <dev@robinlinden.eu>
// SPDX-FileCopyrightText: 2022 Mikael Larsson <c.mikael.larsson@gmail.com>
//
// SPDX-License-Identifier: BSD-2-Clause
@@ -1396,6 +1396,35 @@ int main() {
expect_eq(layout.dimensions.border, geom::EdgeSize{.left = 3});
});
 
etest::test("text, bold", [] {
dom::Node dom = dom::Element{.name{"html"}, .children{dom::Text{"hello"}}};
style::StyledNode style{
.node{dom},
.properties{
{css::PropertyId::Display, "inline"},
{css::PropertyId::FontSize, "10px"},
{css::PropertyId::FontWeight, "bold"},
},
.children{style::StyledNode{.node{std::get<dom::Element>(dom).children[0]}}},
};
set_up_parent_ptrs(style);
 
layout::LayoutBox expected{
.node = &style,
.type = LayoutType::Inline,
.dimensions{{0, 0, 25, 10}},
.children{layout::LayoutBox{
.node = &style.children[0],
.type = LayoutType::Inline,
.dimensions{{0, 0, 25, 10}},
.layout_text = "hello"sv,
}},
};
 
auto l = layout::create_layout(style, 30, NoType{}).value();
expect_eq(l, expected);
});
 
etest::test("text, no font available", [] {
dom::Node dom = dom::Element{.name{"html"}, .children{dom::Text{"hello"}}};
style::StyledNode style{