RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-30 14:18:11 +00:00
Code Issues Activity Actions

LibWeb: Use CSS Pixels for overflow clip rect

Browse source
This commit is contained in:
Aliaksandr Kalenik 2023-01-23 11:27:17 +03:00 • committed by Andreas Kling
parent 3bd96f29d2
commit 802d9336f0
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -318,7 +318,7 @@ BorderRadiiData PaintableBox::normalized_border_radii_data(ShrinkRadiiForBorders
return border_radius_data; return border_radius_data;
} }
Optional<Gfx::IntRect> PaintableBox::clip_rect() const Optional<CSSPixelRect> PaintableBox::clip_rect() const
{ {
if (!m_clip_rect.has_value()) { if (!m_clip_rect.has_value()) {
if (containing_block() && containing_block()->paint_box()) if (containing_block() && containing_block()->paint_box())
@ -329,9 +329,9 @@ Optional<Gfx::IntRect> PaintableBox::clip_rect() const
if (overflow_x == CSS::Overflow::Hidden && overflow_y == CSS::Overflow::Hidden) { if (overflow_x == CSS::Overflow::Hidden && overflow_y == CSS::Overflow::Hidden) {
if (m_clip_rect.has_value()) { if (m_clip_rect.has_value()) {
m_clip_rect->intersect(absolute_padding_box_rect().to_type<float>().to_rounded<int>()); m_clip_rect->intersect(absolute_padding_box_rect());
} else { } else {
m_clip_rect = absolute_padding_box_rect().to_type<float>().to_rounded<int>(); m_clip_rect = absolute_padding_box_rect();
} }
} }
} }
@ -352,7 +352,7 @@ void PaintableBox::before_children_paint(PaintContext& context, PaintPhase phase
auto clip_overflow = [&] { auto clip_overflow = [&] {
if (!m_clipping_overflow) { if (!m_clipping_overflow) {
context.painter().save(); context.painter().save();
context.painter().add_clip_rect(*clip_rect); context.painter().add_clip_rect(context.rounded_device_rect(*clip_rect).to_type<int>());
m_clipping_overflow = true; m_clipping_overflow = true;
} }
}; };
@ -364,7 +364,7 @@ void PaintableBox::before_children_paint(PaintContext& context, PaintPhase phase
if (overflow_y == CSS::Overflow::Hidden || overflow_x == CSS::Overflow::Hidden) { if (overflow_y == CSS::Overflow::Hidden || overflow_x == CSS::Overflow::Hidden) {
auto border_radii_data = normalized_border_radii_data(ShrinkRadiiForBorders::Yes); auto border_radii_data = normalized_border_radii_data(ShrinkRadiiForBorders::Yes);
if (border_radii_data.has_any_radius()) { if (border_radii_data.has_any_radius()) {
auto corner_clipper = BorderRadiusCornerClipper::create(context, clip_rect->to_type<DevicePixels>(), border_radii_data, CornerClip::Outside, BorderRadiusCornerClipper::UseCachedBitmap::No); auto corner_clipper = BorderRadiusCornerClipper::create(context, context.rounded_device_rect(*clip_rect), border_radii_data, CornerClip::Outside, BorderRadiusCornerClipper::UseCachedBitmap::No);
if (corner_clipper.is_error()) { if (corner_clipper.is_error()) {
dbgln("Failed to create overflow border-radius corner clipper: {}", corner_clipper.error()); dbgln("Failed to create overflow border-radius corner clipper: {}", corner_clipper.error());
return; return;

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

@ -98,7 +98,7 @@ public:
return m_overflow_data->scrollable_overflow_rect; return m_overflow_data->scrollable_overflow_rect;
} }
Optional<Gfx::IntRect> clip_rect() const; Optional<CSSPixelRect> clip_rect() const;
void set_overflow_data(Optional<OverflowData> data) { m_overflow_data = move(data); } void set_overflow_data(Optional<OverflowData> data) { m_overflow_data = move(data); }
void set_containing_line_box_fragment(Optional<Layout::LineBoxFragmentCoordinate>); void set_containing_line_box_fragment(Optional<Layout::LineBoxFragmentCoordinate>);
@ -157,7 +157,7 @@ private:
Optional<CSSPixelRect> mutable m_absolute_rect; Optional<CSSPixelRect> mutable m_absolute_rect;
Optional<CSSPixelRect> mutable m_absolute_paint_rect; Optional<CSSPixelRect> mutable m_absolute_paint_rect;
Optional<Gfx::IntRect> mutable m_clip_rect; Optional<CSSPixelRect> mutable m_clip_rect;
mutable bool m_clipping_overflow { false }; mutable bool m_clipping_overflow { false };
Optional<BorderRadiusCornerClipper> mutable m_overflow_corner_radius_clipper; Optional<BorderRadiusCornerClipper> mutable m_overflow_corner_radius_clipper;