mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 13:57:35 +00:00
LibWeb: Make text newlines in "pre" mode emit a ForcedBreak item
Instead of emitting a Text item with the "should_force_break" flag set to true, newlines in newline-preserving text content now timply turn into ForcedBreak items. This makes the <pre> element work again.
This commit is contained in:
parent
d32630e17b
commit
aefe1727fc
6 changed files with 14 additions and 11 deletions
|
@ -593,7 +593,7 @@ void BlockFormattingContext::layout_floating_box(Box const& box, BlockContainer
|
||||||
// If we have a LineBuilder, we're in the middle of inline layout, otherwise this is block layout.
|
// If we have a LineBuilder, we're in the middle of inline layout, otherwise this is block layout.
|
||||||
if (line_builder) {
|
if (line_builder) {
|
||||||
float y_offset = box_state.margin_box_top() + box_state.inset_top;
|
float y_offset = box_state.margin_box_top() + box_state.inset_top;
|
||||||
line_builder->break_if_needed(layout_mode, box_state.border_box_width(), false);
|
line_builder->break_if_needed(layout_mode, box_state.border_box_width());
|
||||||
box_state.offset.set_y(line_builder->current_y() + y_offset);
|
box_state.offset.set_y(line_builder->current_y() + y_offset);
|
||||||
line_builder->adjust_last_line_after_inserting_floating_box({}, box.computed_values().float_(), box_state.border_box_width());
|
line_builder->adjust_last_line_after_inserting_floating_box({}, box.computed_values().float_(), box_state.border_box_width());
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -241,7 +241,7 @@ void InlineFormattingContext::generate_line_boxes(LayoutMode layout_mode)
|
||||||
break;
|
break;
|
||||||
case InlineLevelIterator::Item::Type::Element: {
|
case InlineLevelIterator::Item::Type::Element: {
|
||||||
auto& box = verify_cast<Layout::Box>(*item.node);
|
auto& box = verify_cast<Layout::Box>(*item.node);
|
||||||
line_builder.break_if_needed(layout_mode, item.border_box_width(), item.should_force_break);
|
line_builder.break_if_needed(layout_mode, item.border_box_width());
|
||||||
line_builder.append_box(box, item.border_start + item.padding_start, item.padding_end + item.border_end, item.margin_start, item.margin_end);
|
line_builder.append_box(box, item.border_start + item.padding_start, item.padding_end + item.border_end, item.margin_start, item.margin_end);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -257,7 +257,7 @@ void InlineFormattingContext::generate_line_boxes(LayoutMode layout_mode)
|
||||||
|
|
||||||
case InlineLevelIterator::Item::Type::Text: {
|
case InlineLevelIterator::Item::Type::Text: {
|
||||||
auto& text_node = verify_cast<Layout::TextNode>(*item.node);
|
auto& text_node = verify_cast<Layout::TextNode>(*item.node);
|
||||||
if (line_builder.break_if_needed(layout_mode, item.border_box_width(), item.should_force_break)) {
|
if (line_builder.break_if_needed(layout_mode, item.border_box_width())) {
|
||||||
if (item.is_collapsible_whitespace)
|
if (item.is_collapsible_whitespace)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -142,13 +142,19 @@ Optional<InlineLevelIterator::Item> InlineLevelIterator::next(float available_wi
|
||||||
|
|
||||||
auto& chunk = chunk_opt.value();
|
auto& chunk = chunk_opt.value();
|
||||||
float chunk_width = text_node.font().width(chunk.view) + text_node.font().glyph_spacing();
|
float chunk_width = text_node.font().width(chunk.view) + text_node.font().glyph_spacing();
|
||||||
|
|
||||||
|
if (m_text_node_context->do_respect_linebreaks && chunk.has_breaking_newline) {
|
||||||
|
return Item {
|
||||||
|
.type = Item::Type::ForcedBreak,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
Item item {
|
Item item {
|
||||||
.type = Item::Type::Text,
|
.type = Item::Type::Text,
|
||||||
.node = &text_node,
|
.node = &text_node,
|
||||||
.offset_in_node = chunk.start,
|
.offset_in_node = chunk.start,
|
||||||
.length_in_node = chunk.length,
|
.length_in_node = chunk.length,
|
||||||
.width = chunk_width,
|
.width = chunk_width,
|
||||||
.should_force_break = m_text_node_context->do_respect_linebreaks && chunk.has_breaking_newline,
|
|
||||||
.is_collapsible_whitespace = m_text_node_context->do_collapse && chunk.is_all_whitespace,
|
.is_collapsible_whitespace = m_text_node_context->do_collapse && chunk.is_all_whitespace,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -40,7 +40,6 @@ public:
|
||||||
float border_end { 0.0f };
|
float border_end { 0.0f };
|
||||||
float margin_start { 0.0f };
|
float margin_start { 0.0f };
|
||||||
float margin_end { 0.0f };
|
float margin_end { 0.0f };
|
||||||
bool should_force_break { false };
|
|
||||||
bool is_collapsible_whitespace { false };
|
bool is_collapsible_whitespace { false };
|
||||||
|
|
||||||
float border_box_width() const
|
float border_box_width() const
|
||||||
|
|
|
@ -79,12 +79,10 @@ void LineBuilder::append_text_chunk(TextNode const& text_node, size_t offset_in_
|
||||||
m_max_height_on_current_line = max(m_max_height_on_current_line, content_height);
|
m_max_height_on_current_line = max(m_max_height_on_current_line, content_height);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool LineBuilder::should_break(LayoutMode layout_mode, float next_item_width, bool should_force_break)
|
bool LineBuilder::should_break(LayoutMode layout_mode, float next_item_width)
|
||||||
{
|
{
|
||||||
if (layout_mode == LayoutMode::MinContent)
|
if (layout_mode == LayoutMode::MinContent)
|
||||||
return true;
|
return true;
|
||||||
if (should_force_break)
|
|
||||||
return true;
|
|
||||||
if (layout_mode == LayoutMode::MaxContent)
|
if (layout_mode == LayoutMode::MaxContent)
|
||||||
return false;
|
return false;
|
||||||
auto const& line_boxes = m_containing_block_state.line_boxes;
|
auto const& line_boxes = m_containing_block_state.line_boxes;
|
||||||
|
|
|
@ -23,9 +23,9 @@ public:
|
||||||
void append_text_chunk(TextNode const&, size_t offset_in_node, size_t length_in_node, float leading_size, float trailing_size, float leading_margin, float trailing_margin, float content_width, float content_height);
|
void append_text_chunk(TextNode const&, size_t offset_in_node, size_t length_in_node, float leading_size, float trailing_size, float leading_margin, float trailing_margin, float content_width, float content_height);
|
||||||
|
|
||||||
// Returns whether a line break occurred.
|
// Returns whether a line break occurred.
|
||||||
bool break_if_needed(LayoutMode layout_mode, float next_item_width, bool should_force_break)
|
bool break_if_needed(LayoutMode layout_mode, float next_item_width)
|
||||||
{
|
{
|
||||||
if (should_break(layout_mode, next_item_width, should_force_break)) {
|
if (should_break(layout_mode, next_item_width)) {
|
||||||
break_line();
|
break_line();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -45,7 +45,7 @@ public:
|
||||||
private:
|
private:
|
||||||
void begin_new_line(bool increment_y);
|
void begin_new_line(bool increment_y);
|
||||||
|
|
||||||
bool should_break(LayoutMode, float next_item_width, bool should_force_break);
|
bool should_break(LayoutMode, float next_item_width);
|
||||||
|
|
||||||
LineBox& ensure_last_line_box();
|
LineBox& ensure_last_line_box();
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue