summaryrefslogtreecommitdiff
path: root/Userland/Libraries/LibWeb
diff options
context:
space:
mode:
authorSam Atkins <atkinssj@serenityos.org>2021-09-19 17:16:00 +0100
committerAndreas Kling <kling@serenityos.org>2021-09-19 22:53:35 +0200
commit912596fae8d1030e4511b80dd64bfebdf7c21328 (patch)
treea9c25b669b205b8d747522715f37096a26b02d16 /Userland/Libraries/LibWeb
parent14dc20118c3f4aa3293ee92d34a62330f091af40 (diff)
downloadserenity-912596fae8d1030e4511b80dd64bfebdf7c21328.zip
LibWeb: Give InlineNodes a background
This now uses the same code as Box, so images, repeat-rules, and anything that's added in the future will work for `display: inline` elements too. :^)
Diffstat (limited to 'Userland/Libraries/LibWeb')
-rw-r--r--Userland/Libraries/LibWeb/Layout/InlineNode.cpp43
-rw-r--r--Userland/Libraries/LibWeb/Layout/InlineNode.h4
2 files changed, 41 insertions, 6 deletions
diff --git a/Userland/Libraries/LibWeb/Layout/InlineNode.cpp b/Userland/Libraries/LibWeb/Layout/InlineNode.cpp
index bc7a6c8a84..8d136620dc 100644
--- a/Userland/Libraries/LibWeb/Layout/InlineNode.cpp
+++ b/Userland/Libraries/LibWeb/Layout/InlineNode.cpp
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
+ * Copyright (c) 2021, Sam Atkins <atkinssj@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@@ -10,6 +11,8 @@
#include <LibWeb/Layout/BlockBox.h>
#include <LibWeb/Layout/InlineFormattingContext.h>
#include <LibWeb/Layout/InlineNode.h>
+#include <LibWeb/Painting/BackgroundPainting.h>
+#include <LibWeb/Painting/BorderPainting.h>
namespace Web::Layout {
@@ -45,9 +48,23 @@ void InlineNode::paint(PaintContext& context, PaintPhase phase)
auto& painter = context.painter();
if (phase == PaintPhase::Background) {
- containing_block()->for_each_fragment([&](auto& fragment) {
- if (is_inclusive_ancestor_of(fragment.layout_node()))
- painter.fill_rect(enclosing_int_rect(fragment.absolute_rect()), computed_values().background_color());
+ auto background_data = Painting::BackgroundData {
+ .color = computed_values().background_color(),
+ .image = background_image() ? background_image()->bitmap() : nullptr,
+ .repeat_x = computed_values().background_repeat_x(),
+ .repeat_y = computed_values().background_repeat_y()
+ };
+
+ auto top_left_border_radius = computed_values().border_top_left_radius();
+ auto top_right_border_radius = computed_values().border_top_right_radius();
+ auto bottom_right_border_radius = computed_values().border_bottom_right_radius();
+ auto bottom_left_border_radius = computed_values().border_bottom_left_radius();
+
+ for_each_fragment([&](auto& fragment) {
+ // FIXME: This recalculates our (InlineNode's) absolute_rect() for every single fragment!
+ auto rect = fragment.absolute_rect();
+ auto border_radius_data = Painting::normalized_border_radius_data(*this, rect, top_left_border_radius, top_right_border_radius, bottom_right_border_radius, bottom_left_border_radius);
+ Painting::paint_background(context, enclosing_int_rect(rect), background_data, border_radius_data);
return IterationDecision::Continue;
});
}
@@ -56,12 +73,26 @@ void InlineNode::paint(PaintContext& context, PaintPhase phase)
// FIXME: This paints a double-thick border between adjacent fragments, where ideally there
// would be none. Once we implement non-rectangular outlines for the `outline` CSS
// property, we can use that here instead.
- containing_block()->for_each_fragment([&](auto& fragment) {
- if (is_inclusive_ancestor_of(fragment.layout_node()))
- painter.draw_rect(enclosing_int_rect(fragment.absolute_rect()), Color::Magenta);
+ for_each_fragment([&](auto& fragment) {
+ painter.draw_rect(enclosing_int_rect(fragment.absolute_rect()), Color::Magenta);
return IterationDecision::Continue;
});
}
}
+template<typename Callback>
+void InlineNode::for_each_fragment(Callback callback)
+{
+ // FIXME: This will be slow if the containing block has a lot of fragments!
+ containing_block()->for_each_fragment([&](auto& fragment) {
+ if (!is_inclusive_ancestor_of(fragment.layout_node()))
+ return IterationDecision::Continue;
+ // FIXME: This skips the 0-width fragments at the start and end of the InlineNode.
+ // A better solution would be to not generate them in the first place.
+ if (fragment.width() == 0 || fragment.height() == 0)
+ return IterationDecision::Continue;
+ return callback(fragment);
+ });
+}
+
}
diff --git a/Userland/Libraries/LibWeb/Layout/InlineNode.h b/Userland/Libraries/LibWeb/Layout/InlineNode.h
index e2e39600f3..a630de43b7 100644
--- a/Userland/Libraries/LibWeb/Layout/InlineNode.h
+++ b/Userland/Libraries/LibWeb/Layout/InlineNode.h
@@ -18,6 +18,10 @@ public:
virtual void paint(PaintContext&, PaintPhase) override;
virtual void split_into_lines(InlineFormattingContext&, LayoutMode) override;
+
+private:
+ template<typename Callback>
+ void for_each_fragment(Callback);
};
}