beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 07:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

LibGfx: Add Painter::fill_rect_with_rounded_corners()

Browse source 
This paints a rectangle with rounded corners each specified by a
radius.
This commit is contained in:
Tobias Christiansen 2021-05-15 23:33:21 +02:00 committed by Andreas Kling
parent 520441d472
commit 819e0e0440
Notes: sideshowbarker 2024-07-18 17:41:28 +09:00 
Author: https://github.com/TobyAsE
Commit: https://github.com/SerenityOS/serenity/commit/819e0e0440d
Pull-request: https://github.com/SerenityOS/serenity/pull/7115
Reviewed-by: https://github.com/awesomekling
2 changed files with 146 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

138
Userland/Libraries/LibGfx/Painter.cpp
View file

@ -247,6 +247,143 @@ void Painter::fill_rect_with_gradient(const IntRect& a_rect, Color gradient_star
return fill_rect_with_gradient(Orientation::Horizontal, a_rect, gradient_start, gradient_end);
}
void Painter::fill_rect_with_rounded_corners(const IntRect& a_rect, Color color, int top_left_radius, int top_right_radius, int bottom_right_radius, int bottom_left_radius)
{
// Fasttrack for rects without any border radii
if (!top_left_radius && !top_right_radius && !bottom_right_radius && !bottom_left_radius)
return fill_rect(a_rect, color);
// Fully transparent, dont care.
if (color.alpha() == 0)
return;
// FIXME: Allow for elliptically rounded corners
IntRect top_left_corner = {
a_rect.x(),
a_rect.y(),
top_left_radius,
top_left_radius
};
IntRect top_right_corner = {
a_rect.x() + a_rect.width() - top_right_radius,
a_rect.y(),
top_right_radius,
top_right_radius
};
IntRect bottom_right_corner = {
a_rect.x() + a_rect.width() - bottom_right_radius,
a_rect.y() + a_rect.height() - bottom_right_radius,
bottom_right_radius,
bottom_right_radius
};
IntRect bottom_left_corner = {
a_rect.x(),
a_rect.y() + a_rect.height() - bottom_left_radius,
bottom_left_radius,
bottom_left_radius
};
IntRect top_rect = {
a_rect.x() + top_left_radius,
a_rect.y(),
a_rect.width() - top_left_radius - top_right_radius, top_left_radius
};
IntRect right_rect = {
a_rect.x() + a_rect.width() - top_right_radius,
a_rect.y() + top_right_radius,
top_right_radius,
a_rect.height() - top_right_radius - bottom_right_radius
};
IntRect bottom_rect = {
a_rect.x() + bottom_left_radius,
a_rect.y() + a_rect.height() - bottom_right_radius,
a_rect.width() - bottom_left_radius - bottom_right_radius,
bottom_right_radius
};
IntRect left_rect = {
a_rect.x(),
a_rect.y() + top_left_radius,
bottom_left_radius,
a_rect.height() - top_left_radius - bottom_left_radius
};
IntRect inner = {
left_rect.x() + left_rect.width(),
left_rect.y(),
a_rect.width() - left_rect.width() - right_rect.width(),
a_rect.height() - top_rect.height() - bottom_rect.height()
};
fill_rect(top_rect, color);
fill_rect(right_rect, color);
fill_rect(bottom_rect, color);
fill_rect(left_rect, color);
fill_rect(inner, color);
if (top_left_radius)
fill_rounded_corner(top_left_corner, top_left_radius, color, CornerOrientation::TopLeft);
if (top_right_radius)
fill_rounded_corner(top_right_corner, top_right_radius, color, CornerOrientation::TopRight);
if (bottom_left_radius)
fill_rounded_corner(bottom_left_corner, bottom_left_radius, color, CornerOrientation::BottomLeft);
if (bottom_right_radius)
fill_rounded_corner(bottom_right_corner, bottom_right_radius, color, CornerOrientation::BottomRight);
}
void Painter::fill_rounded_corner(const IntRect& a_rect, int radius, Color color, CornerOrientation orientation)
{
// Care about clipping
auto translated_a_rect = a_rect.translated(translation());
auto rect = translated_a_rect.intersected(clip_rect());
if (rect.is_empty())
return;
VERIFY(m_target->rect().contains(rect));
// We got cut on the top!
// FIXME: Also account for clipping on the x-axis
int clip_offset = 0;
if (translated_a_rect.y() < rect.y())
clip_offset = rect.y() - translated_a_rect.y();
RGBA32* dst = m_target->scanline(rect.top()) + rect.left();
const size_t dst_skip = m_target->pitch() / sizeof(RGBA32);
IntPoint circle_center;
switch (orientation) {
case CornerOrientation::TopLeft:
circle_center = { radius, radius + 1 };
break;
case CornerOrientation::TopRight:
circle_center = { -1, radius + 1 };
break;
case CornerOrientation::BottomRight:
circle_center = { -1, 0 };
break;
case CornerOrientation::BottomLeft:
circle_center = { radius, 0 };
break;
default:
VERIFY_NOT_REACHED();
}
int radius2 = radius * radius;
auto is_in_circle = [&](int x, int y) {
int distance2 = (circle_center.x() - x) * (circle_center.x() - x) + (circle_center.y() - y) * (circle_center.y() - y);
// To reflect the grid and be compatible with the draw_circle_arc_intersecting algorithm
// add 1/2 to the radius
return distance2 <= (radius2 + radius + 0.25);
};
for (int i = rect.height() - 1; i >= 0; --i) {
for (int j = 0; j < rect.width(); ++j)
if (is_in_circle(j, rect.height() - i + clip_offset))
dst[j] = color.value();
dst += dst_skip;
}
}
void Painter::fill_ellipse(const IntRect& a_rect, Color color)
{
VERIFY(scale() == 1); // FIXME: Add scaling support.
@ -2040,5 +2177,4 @@ void Gfx::Painter::draw_ui_text(const Gfx::IntRect& rect, const StringView& text
}
}
}
}

9
Userland/Libraries/LibGfx/Painter.h
View file

@ -36,6 +36,7 @@ public:
void fill_rect_with_checkerboard(const IntRect&, const IntSize&, Color color_dark, Color color_light);
void fill_rect_with_gradient(Orientation, const IntRect&, Color gradient_start, Color gradient_end);
void fill_rect_with_gradient(const IntRect&, Color gradient_start, Color gradient_end);
void fill_rect_with_rounded_corners(const IntRect&, Color, int top_left_radius, int top_right_radius, int bottom_right_radius, int bottom_left_radius);
void fill_ellipse(const IntRect&, Color);
void draw_rect(const IntRect&, Color, bool rough = false);
void draw_focus_rect(const IntRect&, Color);
@ -71,6 +72,14 @@ public:
void draw_emoji(const IntPoint&, const Gfx::Bitmap&, const Font&);
void draw_glyph_or_emoji(const IntPoint&, u32 code_point, const Font&, Color);
enum class CornerOrientation {
TopLeft,
TopRight,
BottomRight,
BottomLeft
};
void fill_rounded_corner(const IntRect&, int radius, Color, CornerOrientation);
static void for_each_line_segment_on_bezier_curve(const FloatPoint& control_point, const FloatPoint& p1, const FloatPoint& p2, Function<void(const FloatPoint&, const FloatPoint&)>&);
static void for_each_line_segment_on_bezier_curve(const FloatPoint& control_point, const FloatPoint& p1, const FloatPoint& p2, Function<void(const FloatPoint&, const FloatPoint&)>&&);