beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 23:50:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

LibWeb: Add support for "display: inline-block"

Browse source 
This display type is implemented using a LayoutBlock that is_inline().
Basically it behaves like a block internally, and its children are laid
out in the normal block layout fashion. Externally however, it behaves
like an atomic inline-level box.

Layout of inline-block boxes happens in three stages:

1. The outer dimensions of the block are computed during the recursive
   normal layout pass. We skip positioning, but lay out children.

2. Later on, during line layout in the *containing block*, the inline
   block now contributes a linebox fragment. When linebox fragments are
   positioned, we learn the final position of the inline block. That's
   when we set the inline block's position.

3. We re-layout the inline block's children once again. This is done to
   make sure they end up in the right position. The layout tree doesn't
   use relative offsets, so after we position the inline block in (2),
   its children will not have its positions updated. Relayout moves
   all children of inline blocks to the right place.

This is a rather naive approach but it does get the basic behavior into
place so we can iterate on it. :^)
This commit is contained in:
Andreas Kling 2020-05-05 16:06:22 +02:00
parent 0a1ecbec48
commit e73ad78ba6
Notes: sideshowbarker 2024-07-19 06:56:58 +09:00 
Author: https://github.com/awesomekling
Commit: https://github.com/SerenityOS/serenity/commit/e73ad78ba60
6 changed files with 51 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Base/home/anon/www/inline-block.html Normal file
View file

@ -0,0 +1,20 @@
<!DOCTYPE html>
<html>
<head>
<title>display: inline-block</title>
<style>
div {
display: inline-block;
width: 200px;
height: 100px;
margin: 20px;
border: 1px solid black;
}
</style>
</head>
<body>
<div>Hello friends! This <b>div</b> has <b>display: inline-block</b> :^)</div>
<div>Hello friends! That means its laid out like a block on the inside.</div>
<div>Hello friends! But it acts like an atomic inline box on the outside!</div>
</body>
</html>

1
Base/home/anon/www/welcome.html
View file

@ -28,6 +28,7 @@ span#ua {
<p>Your user agent is: <b><span id="ua"></span></b></p>
<p>Some small test pages:</p>
<ul>
<li><a href="inline-block.html">display: inline-block; test</a></li>
<li><a href="canvas-path-quadratic-curve.html">canvas path quadratic curve test</a></li>
<li><a href="pngsuite_siz_png.html">pngsuite odd sizes test</a></li>
<li><a href="pngsuite_bas_png.html">pngsuite basic formats test</a></li>

7
Libraries/LibWeb/DOM/Element.cpp
View file

@ -130,8 +130,11 @@ RefPtr<LayoutNode> Element::create_layout_node(const StyleProperties* parent_sty
return adopt(*new LayoutTableRow(*this, move(style)));
if (display == "table-cell")
return adopt(*new LayoutTableCell(*this, move(style)));
if (display == "inline-block")
return adopt(*new LayoutBlock(this, move(style)));
if (display == "inline-block") {
auto inline_block = adopt(*new LayoutBlock(this, move(style)));
inline_block->set_inline(true);
return inline_block;
}
dbg() << "Unknown display type: _" << display << "_";
return adopt(*new LayoutInline(*this, move(style)));

22
Libraries/LibWeb/Layout/LayoutBlock.cpp
View file

@ -56,7 +56,9 @@ LayoutNode& LayoutBlock::inline_wrapper()
void LayoutBlock::layout()
{
compute_width();
compute_position();
if (!is_inline())
compute_position();
if (children_are_inline())
layout_inline_children();
@ -168,6 +170,12 @@ void LayoutBlock::layout_inline_children()
if (is<LayoutReplaced>(fragment.layout_node()))
const_cast<LayoutReplaced&>(to<LayoutReplaced>(fragment.layout_node())).set_rect(fragment.rect());
if (fragment.layout_node().is_inline_block()) {
auto& inline_block = const_cast<LayoutBlock&>(to<LayoutBlock>(fragment.layout_node()));
inline_block.set_rect(fragment.rect());
inline_block.layout();
}
float final_line_box_width = 0;
for (auto& fragment : line_box.fragments())
final_line_box_width += fragment.rect().width();
@ -418,4 +426,16 @@ LineBox& LayoutBlock::add_line_box()
return m_line_boxes.last();
}
void LayoutBlock::split_into_lines(LayoutBlock& container)
{
ASSERT(is_inline());
layout();
auto* line_box = &container.ensure_last_line_box();
if (line_box->width() > 0 && line_box->width() + width() > container.width())
line_box = &container.add_line_box();
line_box->add_fragment(*this, 0, 0, width(), height());
}
}

2
Libraries/LibWeb/Layout/LayoutBlock.h
View file

@ -63,6 +63,8 @@ public:
template<typename Callback>
void for_each_fragment(Callback) const;
virtual void split_into_lines(LayoutBlock& container) override;
private:
virtual bool is_block() const override { return true; }

2
Libraries/LibWeb/Layout/LayoutNode.h
View file

@ -97,6 +97,8 @@ public:
bool is_inline() const { return m_inline; }
void set_inline(bool b) { m_inline = b; }
bool is_inline_block() const { return is_inline() && is_block(); }
virtual void layout();
virtual void render(RenderingContext&);