diff options
author | MacDue <macdue@dueutil.tech> | 2022-06-01 00:51:38 +0100 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2022-06-01 19:33:45 +0200 |
commit | 8ac5f625e90d137096827d55a3916fdc67a89e81 (patch) | |
tree | 729b4bc12e4f38cc7c266ab91c30297f232dc054 /Userland/Libraries/LibGfx | |
parent | f578247cdf90036a74ec00732f0b14f35520f11c (diff) | |
download | serenity-8ac5f625e90d137096827d55a3916fdc67a89e81.zip |
LibGfx: Rename draw_ellipse/circle to fill_ellipse/circle
This makes these functions more consistent with the non-aa painter.
Diffstat (limited to 'Userland/Libraries/LibGfx')
-rw-r--r-- | Userland/Libraries/LibGfx/AntiAliasingPainter.cpp | 14 | ||||
-rw-r--r-- | Userland/Libraries/LibGfx/AntiAliasingPainter.h | 5 |
2 files changed, 10 insertions, 9 deletions
diff --git a/Userland/Libraries/LibGfx/AntiAliasingPainter.cpp b/Userland/Libraries/LibGfx/AntiAliasingPainter.cpp index 31cc72fa56..6634a9b683 100644 --- a/Userland/Libraries/LibGfx/AntiAliasingPainter.cpp +++ b/Userland/Libraries/LibGfx/AntiAliasingPainter.cpp @@ -192,14 +192,14 @@ void Gfx::AntiAliasingPainter::draw_cubic_bezier_curve(FloatPoint const& control }); } -void Gfx::AntiAliasingPainter::draw_circle(IntPoint const& center, int radius, Color color) +void Gfx::AntiAliasingPainter::fill_circle(IntPoint const& center, int radius, Color color) { if (radius <= 0) return; draw_ellipse_part(center, radius, radius, color, false, {}); } -void Gfx::AntiAliasingPainter::draw_ellipse(IntRect const& a_rect, Color color) +void Gfx::AntiAliasingPainter::fill_ellipse(IntRect const& a_rect, Color color) { auto center = a_rect.center(); auto radius_a = a_rect.width() / 2; @@ -207,7 +207,7 @@ void Gfx::AntiAliasingPainter::draw_ellipse(IntRect const& a_rect, Color color) if (radius_a <= 0 || radius_b <= 0) return; if (radius_a == radius_b) - return draw_circle(center, radius_a, color); + return fill_circle(center, radius_a, color); auto x_paint_range = draw_ellipse_part(center, radius_a, radius_b, color, false, {}); // FIXME: This paints some extra fill pixels that are clipped draw_ellipse_part(center, radius_b, radius_a, color, true, x_paint_range); @@ -471,11 +471,11 @@ void Gfx::AntiAliasingPainter::fill_rect_with_rounded_corners(IntRect const& a_r // FIXME: Don't draw a whole circle each time if (top_left_radius) - draw_circle(top_left_corner, top_left_radius, color); + fill_circle(top_left_corner, top_left_radius, color); if (top_right_radius) - draw_circle(top_right_corner, top_right_radius, color); + fill_circle(top_right_corner, top_right_radius, color); if (bottom_left_radius) - draw_circle(bottom_left_corner, bottom_left_radius, color); + fill_circle(bottom_left_corner, bottom_left_radius, color); if (bottom_right_radius) - draw_circle(bottom_right_corner, bottom_right_radius, color); + fill_circle(bottom_right_corner, bottom_right_radius, color); } diff --git a/Userland/Libraries/LibGfx/AntiAliasingPainter.h b/Userland/Libraries/LibGfx/AntiAliasingPainter.h index 324b38fbb6..ba229e4c87 100644 --- a/Userland/Libraries/LibGfx/AntiAliasingPainter.h +++ b/Userland/Libraries/LibGfx/AntiAliasingPainter.h @@ -28,8 +28,9 @@ public: void translate(float dx, float dy) { m_transform.translate(dx, dy); } void translate(FloatPoint const& delta) { m_transform.translate(delta); } - void draw_circle(IntPoint const& center, int radius, Color); - void draw_ellipse(IntRect const& a_rect, Color); + void fill_circle(IntPoint const& center, int radius, Color); + void fill_ellipse(IntRect const& a_rect, Color); + 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); |