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

LibWeb: Apply CSS clip property to an element as well as its children

Browse source 
d06d4eb made the `clip` property apply to children of an absolute-
positioned element, but caused it not to be applied to the element the
property was applied to directly.

To fix this, apply the clip in new `before_paint()` and `after_paint()`
functions. Doing so keeps painter state from leaking from `paint()`,
but still allows subclasses of `PaintableBox` clip their contents
correctly without repeating the application of the clip rectangle.
This commit is contained in:
Zaggy1024 2023-08-31 17:08:45 -05:00 • committed by Alexander Kalenik
parent 2e45306d42
commit 9d4a1ac2b3
4 changed files with 47 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Userland/Libraries/LibWeb/Painting/Paintable.h
View file

@ -109,6 +109,9 @@ public:
return TraversalDecision::Continue;
}
virtual void before_paint(PaintContext&, PaintPhase) const { }
virtual void after_paint(PaintContext&, PaintPhase) const { }
virtual void paint(PaintContext&, PaintPhase) const { }
virtual void before_children_paint(PaintContext&, PaintPhase) const { }

46
Userland/Libraries/LibWeb/Painting/PaintableBox.cpp
View file

@ -176,6 +176,37 @@ StackingContext* PaintableBox::enclosing_stacking_context()
VERIFY_NOT_REACHED();
}
Optional<CSSPixelRect> PaintableBox::get_clip_rect() const
{
auto clip = computed_values().clip();
if (clip.is_rect() && layout_box().is_absolutely_positioned()) {
auto border_box = absolute_border_box_rect();
return clip.to_rect().resolved(layout_node(), border_box.to_type<double>()).to_type<CSSPixels>();
}
return {};
}
void PaintableBox::before_paint(PaintContext& context, [[maybe_unused]] PaintPhase phase) const
{
if (!is_visible())
return;
auto clip_rect = get_clip_rect();
if (clip_rect.has_value()) {
context.painter().save();
context.painter().add_clip_rect(clip_rect->to_type<int>());
}
}
void PaintableBox::after_paint(PaintContext& context, [[maybe_unused]] PaintPhase phase) const
{
if (!is_visible())
return;
if (get_clip_rect().has_value())
context.painter().restore();
}
void PaintableBox::paint(PaintContext& context, PaintPhase phase) const
{
if (!is_visible())
@ -424,15 +455,12 @@ void PaintableBox::apply_clip_overflow_rect(PaintContext& context, PaintPhase ph
auto overflow_x = computed_values().overflow_x();
auto overflow_y = computed_values().overflow_y();
auto clip = computed_values().clip();
if (clip.is_rect() && layout_box().is_absolutely_positioned()) {
auto border_box = absolute_border_box_rect();
auto resolved_clip_rect = clip.to_rect().resolved(layout_node(), border_box.to_type<double>()).to_type<CSSPixels>();
if (clip_rect.has_value()) {
clip_rect->intersect(resolved_clip_rect);
} else {
clip_rect = resolved_clip_rect;
}
auto css_clip_property = get_clip_rect();
if (css_clip_property.has_value()) {
if (clip_rect.has_value())
clip_rect->intersect(css_clip_property.value());
else
clip_rect = css_clip_property.value();
}
if (!clip_rect.has_value())

5
Userland/Libraries/LibWeb/Painting/PaintableBox.h
View file

@ -20,6 +20,9 @@ public:
static JS::NonnullGCPtr<PaintableBox> create(Layout::Box const&);
virtual ~PaintableBox();
virtual void before_paint(PaintContext&, PaintPhase) const override;
virtual void after_paint(PaintContext&, PaintPhase) const override;
virtual void paint(PaintContext&, PaintPhase) const override;
bool is_visible() const { return layout_box().is_visible(); }
@ -186,6 +189,8 @@ public:
protected:
explicit PaintableBox(Layout::Box const&);
Optional<CSSPixelRect> get_clip_rect() const;
virtual void paint_border(PaintContext&) const;
virtual void paint_backdrop_filter(PaintContext&) const;
virtual void paint_background(PaintContext&) const;

2
Userland/Libraries/LibWeb/Painting/StackingContext.cpp
View file

@ -26,7 +26,9 @@ namespace Web::Painting {
static void paint_node(Paintable const& paintable, PaintContext& context, PaintPhase phase)
{
paintable.before_paint(context, phase);
paintable.paint(context, phase);
paintable.after_paint(context, phase);
}
StackingContext::StackingContext(PaintableBox& paintable_box, StackingContext* parent, size_t index_in_tree_order)