RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-24 19:57:41 +00:00
Code Issues Activity Actions

LibHTML: Don't add whitespace line box fragments at start of line

Browse source 
Collapse whitespace at the start of a line so we don't end up with
" foo bar" :^)
This commit is contained in:
Andreas Kling 2019-10-03 15:55:18 +02:00
parent 279e1dbfc5
commit 4a88caf8e7
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Libraries/LibHTML/Layout/LayoutText.cpp
View file

@ -198,13 +198,16 @@ void LayoutText::split_into_lines(LayoutBlock& container)
for_each_word([&](const Utf8View& view, int start, int length) { for_each_word([&](const Utf8View& view, int start, int length) {
words.append({ Utf8View(view), start, length }); words.append({ Utf8View(view), start, length });
}); });
for (int i = 0; i < words.size(); ++i) { for (int i = 0; i < words.size(); ++i) {
auto& word = words[i]; auto& word = words[i];
int word_width; int word_width;
if (isspace(*word.view.begin())) bool is_whitespace = isspace(*word.view.begin());
if (is_whitespace)
word_width = space_width; word_width = space_width;
else else
word_width = m_font->width(word.view); word_width = m_font->width(word.view);
@ -214,7 +217,15 @@ void LayoutText::split_into_lines(LayoutBlock& container)
available_width = container.rect().width(); available_width = container.rect().width();
} }
if (is_whitespace && line_boxes.last().fragments().is_empty())
continue;
line_boxes.last().add_fragment(*this, word.start, word.length, word_width, line_height); line_boxes.last().add_fragment(*this, word.start, word.length, word_width, line_height);
available_width -= word_width; available_width -= word_width;
if (available_width < 0) {
line_boxes.append(LineBox());
available_width = container.rect().width();
}
} }
} }