mirror of
https://github.com/RGBCube/serenity
synced 2025-07-24 21:07:34 +00:00
LibHTML: Implement LayoutInline::layout()
This currently uses a gross hack where it subtracts 11px from the previous sibling bottom to calculate its top. This should be fixed by switching to a proper two-phase line layouting model, were we first distribute inline elements into lines and figure out their horizontal positions and heights; then compute the needed line heights and position inline elements there vertically.
This commit is contained in:
parent
03cca4510a
commit
9f8d776c70
2 changed files with 28 additions and 0 deletions
|
@ -9,3 +9,29 @@ LayoutInline::LayoutInline(const Node& node, StyleProperties&& style_properties)
|
||||||
LayoutInline::~LayoutInline()
|
LayoutInline::~LayoutInline()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void LayoutInline::layout()
|
||||||
|
{
|
||||||
|
Point origin;
|
||||||
|
|
||||||
|
if (previous_sibling() != nullptr) {
|
||||||
|
auto& previous_sibling_rect = previous_sibling()->rect();
|
||||||
|
auto& previous_sibling_style = previous_sibling()->style();
|
||||||
|
origin = previous_sibling_rect.location();
|
||||||
|
// FIXME: Implement proper inline positioning when
|
||||||
|
// there are nodes with different heights. And don't
|
||||||
|
// hardcode font size like we do here.
|
||||||
|
origin.move_by(previous_sibling_rect.width(), previous_sibling_rect.height());
|
||||||
|
origin.move_by(previous_sibling_style.full_margin().right, -11);
|
||||||
|
} else {
|
||||||
|
origin = parent()->rect().location();
|
||||||
|
}
|
||||||
|
|
||||||
|
rect().set_location(origin);
|
||||||
|
|
||||||
|
for_each_child([&](auto& child) {
|
||||||
|
child.layout();
|
||||||
|
rect().set_right(child.rect().right() + child.style().full_margin().right);
|
||||||
|
rect().set_bottom(child.rect().bottom() + child.style().full_margin().bottom);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
|
@ -12,5 +12,7 @@ public:
|
||||||
virtual const char* class_name() const override { return "LayoutInline"; }
|
virtual const char* class_name() const override { return "LayoutInline"; }
|
||||||
virtual bool is_inline() const override { return true; }
|
virtual bool is_inline() const override { return true; }
|
||||||
|
|
||||||
|
virtual void layout() override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue