RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 15:27:35 +00:00
Code Issues Activity Actions

LibGfx: Support AA rounded rectangles with elliptical borders

Browse source
This commit is contained in:
MacDue 2022-06-12 14:44:29 +01:00 • committed by Linus Groh
parent 125a71d36d
commit 2366a73474
2 changed files with 56 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

99
Userland/Libraries/LibGfx/AntiAliasingPainter.cpp
View file

@ -438,52 +438,61 @@ void Gfx::AntiAliasingPainter::fill_rect_with_rounded_corners(IntRect const& a_r
void Gfx::AntiAliasingPainter::fill_rect_with_rounded_corners(IntRect const& a_rect, Color color, int top_left_radius, int top_right_radius, int bottom_right_radius, int bottom_left_radius) void Gfx::AntiAliasingPainter::fill_rect_with_rounded_corners(IntRect const& a_rect, Color color, int top_left_radius, int top_right_radius, int bottom_right_radius, int bottom_left_radius)
{ {
if (!top_left_radius && !top_right_radius && !bottom_right_radius && !bottom_left_radius) fill_rect_with_rounded_corners(a_rect, color,
{ top_left_radius, top_left_radius },
{ top_right_radius, top_right_radius },
{ bottom_right_radius, bottom_right_radius },
{ bottom_left_radius, bottom_left_radius });
}
void Gfx::AntiAliasingPainter::fill_rect_with_rounded_corners(IntRect const& a_rect, Color color, CornerRadius top_left, CornerRadius top_right, CornerRadius bottom_right, CornerRadius bottom_left)
{
if (!top_left && !top_right && !bottom_right && !bottom_left)
return m_underlying_painter.fill_rect(a_rect, color); return m_underlying_painter.fill_rect(a_rect, color);
if (color.alpha() == 0) if (color.alpha() == 0)
return; return;
IntPoint top_left_corner { IntPoint top_left_corner {
a_rect.x() + top_left_radius, a_rect.x() + top_left.horizontal_radius,
a_rect.y() + top_left_radius, a_rect.y() + top_left.vertical_radius,
}; };
IntPoint top_right_corner { IntPoint top_right_corner {
a_rect.x() + a_rect.width() - top_right_radius, a_rect.x() + a_rect.width() - top_right.horizontal_radius,
a_rect.y() + top_right_radius, a_rect.y() + top_right.vertical_radius,
}; };
IntPoint bottom_left_corner { IntPoint bottom_left_corner {
a_rect.x() + bottom_left_radius, a_rect.x() + bottom_left.horizontal_radius,
a_rect.y() + a_rect.height() - bottom_left_radius a_rect.y() + a_rect.height() - bottom_left.vertical_radius
}; };
IntPoint bottom_right_corner { IntPoint bottom_right_corner {
a_rect.x() + a_rect.width() - bottom_right_radius, a_rect.x() + a_rect.width() - bottom_right.horizontal_radius,
a_rect.y() + a_rect.height() - bottom_right_radius a_rect.y() + a_rect.height() - bottom_right.vertical_radius
}; };
IntRect top_rect { IntRect top_rect {
a_rect.x() + top_left_radius, a_rect.x() + top_left.horizontal_radius,
a_rect.y(), a_rect.y(),
a_rect.width() - top_left_radius - top_right_radius, a_rect.width() - top_left.horizontal_radius - top_right.horizontal_radius,
top_left_radius top_left.vertical_radius
}; };
IntRect right_rect { IntRect right_rect {
a_rect.x() + a_rect.width() - top_right_radius, a_rect.x() + a_rect.width() - top_right.horizontal_radius,
a_rect.y() + top_right_radius, a_rect.y() + top_right.vertical_radius,
top_right_radius, top_right.horizontal_radius,
a_rect.height() - top_right_radius - bottom_right_radius a_rect.height() - top_right.vertical_radius - bottom_right.vertical_radius
}; };
IntRect bottom_rect { IntRect bottom_rect {
a_rect.x() + bottom_left_radius, a_rect.x() + bottom_left.horizontal_radius,
a_rect.y() + a_rect.height() - bottom_right_radius, a_rect.y() + a_rect.height() - bottom_right.vertical_radius,
a_rect.width() - bottom_left_radius - bottom_right_radius, a_rect.width() - bottom_left.horizontal_radius - bottom_right.horizontal_radius,
bottom_right_radius bottom_right.vertical_radius
}; };
IntRect left_rect { IntRect left_rect {
a_rect.x(), a_rect.x(),
a_rect.y() + top_left_radius, a_rect.y() + top_left.vertical_radius,
bottom_left_radius, bottom_left.horizontal_radius,
a_rect.height() - top_left_radius - bottom_left_radius a_rect.height() - top_left.vertical_radius - bottom_left.vertical_radius
}; };
IntRect inner = { IntRect inner = {
@ -499,39 +508,19 @@ void Gfx::AntiAliasingPainter::fill_rect_with_rounded_corners(IntRect const& a_r
m_underlying_painter.fill_rect(left_rect, color); m_underlying_painter.fill_rect(left_rect, color);
m_underlying_painter.fill_rect(inner, color); m_underlying_painter.fill_rect(inner, color);
enum class CornerClip { auto fill_corner = [&](auto const& ellipse_center, auto const& corner_point, CornerRadius const& corner) {
TopLeft,
BottomLeft,
TopRight,
BottomRight
};
auto fill_corner = [&](auto const& point, int radius, CornerClip clip) {
PainterStateSaver save { m_underlying_painter }; PainterStateSaver save { m_underlying_painter };
auto corner_clip = IntRect::from_two_points(point, [&] { m_underlying_painter.add_clip_rect(IntRect::from_two_points(ellipse_center, corner_point));
switch (clip) { fill_ellipse(IntRect::centered_at(ellipse_center, { corner.horizontal_radius * 2, corner.vertical_radius * 2 }), color);
case CornerClip::TopLeft:
return point.translated(-radius, -radius);
case CornerClip::BottomLeft:
return point.translated(-radius, radius);
case CornerClip::TopRight:
return point.translated(radius, -radius);
case CornerClip::BottomRight:
return point.translated(radius, radius);
default:
VERIFY_NOT_REACHED();
}
}());
m_underlying_painter.add_clip_rect(corner_clip);
fill_circle(point, radius, color);
}; };
if (top_left_radius) auto bounding_rect = a_rect.inflated(0, 1, 1, 0);
fill_corner(top_left_corner, top_left_radius, CornerClip::TopLeft); if (top_left)
if (top_right_radius) fill_corner(top_left_corner, bounding_rect.top_left(), top_left);
fill_corner(top_right_corner, top_right_radius, CornerClip::TopRight); if (top_right)
if (bottom_left_radius) fill_corner(top_right_corner, bounding_rect.top_right(), top_right);
fill_corner(bottom_left_corner, bottom_left_radius, CornerClip::BottomLeft); if (bottom_left)
if (bottom_right_radius) fill_corner(bottom_left_corner, bounding_rect.bottom_left(), bottom_left);
fill_corner(bottom_right_corner, bottom_right_radius, CornerClip::BottomRight); if (bottom_right)
fill_corner(bottom_right_corner, bounding_rect.bottom_right(), bottom_right);
} }

12
Userland/Libraries/LibGfx/AntiAliasingPainter.h
View file

@ -41,6 +41,18 @@ public:
void fill_rect_with_rounded_corners(IntRect const&, Color, int radius); void fill_rect_with_rounded_corners(IntRect const&, Color, int radius);
void fill_rect_with_rounded_corners(IntRect const&, Color, int top_left_radius, int top_right_radius, int bottom_right_radius, int bottom_left_radius); void fill_rect_with_rounded_corners(IntRect const&, Color, int top_left_radius, int top_right_radius, int bottom_right_radius, int bottom_left_radius);
struct CornerRadius {
int horizontal_radius;
int vertical_radius;
inline operator bool() const
{
return horizontal_radius > 0 && vertical_radius > 0;
}
};
void fill_rect_with_rounded_corners(IntRect const&, Color, CornerRadius top_left, CornerRadius top_right, CornerRadius bottom_right, CornerRadius bottom_left);
private: private:
struct Range { struct Range {
int min; int min;