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

LibGfx: Support scaling in AntiAliasingPainter::draw_circle()

Browse source 
Previously the painter would crash if scaling was enabled.
This commit is contained in:
MacDue 2022-03-19 00:29:22 +00:00 • committed by Linus Groh
parent 6edea1d59f
commit 3c0e17f29f
3 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -193,6 +193,9 @@ void Gfx::AntiAliasingPainter::draw_circle(IntPoint center, int radius, Color co
Inline comments are from the paper. Inline comments are from the paper.
*/ */
center *= m_underlying_painter.scale();
radius *= m_underlying_painter.scale();
// TODO: Generalize to ellipses (see paper) // TODO: Generalize to ellipses (see paper)
// These happen to be the same here, but are treated separately in the paper: // These happen to be the same here, but are treated separately in the paper:
@ -352,11 +355,11 @@ void Gfx::AntiAliasingPainter::fill_rect_with_rounded_corners(IntRect const& a_r
a_rect.x() + a_rect.width() - top_right_radius, a_rect.x() + a_rect.width() - top_right_radius,
a_rect.y() + top_right_radius, a_rect.y() + top_right_radius,
}; };
IntPoint bottom_right_corner { IntPoint bottom_left_corner {
a_rect.x() + bottom_left_radius, a_rect.x() + bottom_left_radius,
a_rect.y() + a_rect.height() - bottom_right_radius a_rect.y() + a_rect.height() - bottom_right_radius
}; };
IntPoint bottom_left_corner { IntPoint bottom_right_corner {
a_rect.x() + a_rect.width() - bottom_left_radius, a_rect.x() + a_rect.width() - bottom_left_radius,
a_rect.y() + a_rect.height() - bottom_left_radius a_rect.y() + a_rect.height() - bottom_left_radius
}; };

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

@ -1713,11 +1713,11 @@ void Painter::draw_text(Function<void(IntRect const&, Utf8CodePointIterator&)> d
void Painter::set_pixel(IntPoint const& p, Color color, bool blend) void Painter::set_pixel(IntPoint const& p, Color color, bool blend)
{ {
VERIFY(scale() == 1); // FIXME: Add scaling support.
auto point = p; auto point = p;
point.translate_by(state().translation); point.translate_by(state().translation);
if (!clip_rect().contains(point)) // Use the scale only to avoid clipping pixels set in drawing functions that handle
// scaling and call set_pixel() -- do not scale the pixel.
if (!clip_rect().contains(point / scale()))
return; return;
auto& dst = m_target->scanline(point.y())[point.x()]; auto& dst = m_target->scanline(point.y())[point.x()];
if (!blend) { if (!blend) {

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

@ -145,11 +145,12 @@ public:
IntRect clip_rect() const { return state().clip_rect; } IntRect clip_rect() const { return state().clip_rect; }
int scale() const { return state().scale; }
protected: protected:
IntPoint translation() const { return state().translation; } IntPoint translation() const { return state().translation; }
IntRect to_physical(IntRect const& r) const { return r.translated(translation()) * scale(); } IntRect to_physical(IntRect const& r) const { return r.translated(translation()) * scale(); }
IntPoint to_physical(IntPoint const& p) const { return p.translated(translation()) * scale(); } IntPoint to_physical(IntPoint const& p) const { return p.translated(translation()) * scale(); }
int scale() const { return state().scale; }
void set_physical_pixel_with_draw_op(u32& pixel, Color const&); void set_physical_pixel_with_draw_op(u32& pixel, Color const&);
void fill_physical_scanline_with_draw_op(int y, int x, int width, Color const& color); void fill_physical_scanline_with_draw_op(int y, int x, int width, Color const& color);
void fill_rect_with_draw_op(IntRect const&, Color); void fill_rect_with_draw_op(IntRect const&, Color);