RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-06-01 02:38:13 +00:00
Code Issues Activity Actions

LibHTML: Respect the system theme

Browse source 
LibHTML will now use the palette colors for the default document background and
the text. As always, a page can override this default styling with CSS if it
really wants a specific color or style.

Fixes https://github.com/SerenityOS/serenity/issues/963
This commit is contained in:
Sergey Bugaev 2020-01-05 00:09:35 +03:00 • committed by Andreas Kling
parent 7557251fac
commit 0f42908073
5 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Libraries/LibHTML/Layout/LayoutListItemMarker.cpp
View file

@ -15,5 +15,6 @@ void LayoutListItemMarker::render(RenderingContext& context)
Rect bullet_rect { 0, 0, 4, 4 };
bullet_rect.center_within(enclosing_int_rect(rect()));
// FIXME: It would be nicer to not have to go via the parent here to get our inherited style.
context.painter().fill_rect(bullet_rect, parent()->style().color_or_fallback(CSS::PropertyID::Color, document(), Color::Black));
auto color = parent()->style().color_or_fallback(CSS::PropertyID::Color, document(), context.palette().base_text());
context.painter().fill_rect(bullet_rect, color);
}

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

@ -46,7 +46,7 @@ void LayoutText::render_fragment(RenderingContext& context, const LineBoxFragmen
if (background_color.has_value() && background_color.value()->is_color())
painter.fill_rect(enclosing_int_rect(fragment.rect()), background_color.value()->to_color(document()));
auto color = style().color_or_fallback(CSS::PropertyID::Color, document(), Color::Black);
auto color = style().color_or_fallback(CSS::PropertyID::Color, document(), context.palette().base_text());
auto text_decoration = style().string_or_fallback(CSS::PropertyID::TextDecoration, "none");
if (document().inspected_node() == &node())
@ -146,7 +146,7 @@ void LayoutText::split_into_lines(LayoutBlock& container)
if (style().string_or_fallback(CSS::PropertyID::WhiteSpace, "normal") == "pre") {
split_preformatted_into_lines(container);
return;
}
}
// Collapse whitespace into single spaces
auto utf8_view = Utf8View(node().data());