diff options
author | Torstennator <engelTorsten@gmx.de> | 2023-04-25 17:45:45 +0200 |
---|---|---|
committer | Sam Atkins <atkinssj@gmail.com> | 2023-04-29 11:55:31 +0100 |
commit | abcfaca3da4cde641894e724cb6ab1541c6d93e6 (patch) | |
tree | 07e6d85345de5febb1e80a247b3ec53d3056bc81 /Userland/Libraries | |
parent | 81dd29f713331be3e884b026f6714ae7206f2f2f (diff) | |
download | serenity-abcfaca3da4cde641894e724cb6ab1541c6d93e6.zip |
LibGfx: Add support to draw radial gradients with an rotation angle
Diffstat (limited to 'Userland/Libraries')
-rw-r--r-- | Userland/Libraries/LibGfx/GradientPainting.cpp | 17 | ||||
-rw-r--r-- | Userland/Libraries/LibGfx/Painter.h | 2 |
2 files changed, 15 insertions, 4 deletions
diff --git a/Userland/Libraries/LibGfx/GradientPainting.cpp b/Userland/Libraries/LibGfx/GradientPainting.cpp index 7d1cd65c60..f6826066ab 100644 --- a/Userland/Libraries/LibGfx/GradientPainting.cpp +++ b/Userland/Libraries/LibGfx/GradientPainting.cpp @@ -213,18 +213,28 @@ static auto create_conic_gradient(ReadonlySpan<ColorStop> color_stops, FloatPoin }; } -static auto create_radial_gradient(IntRect const& physical_rect, ReadonlySpan<ColorStop> color_stops, IntPoint center, IntSize size, Optional<float> repeat_length) +static auto create_radial_gradient(IntRect const& physical_rect, ReadonlySpan<ColorStop> color_stops, IntPoint center, IntSize size, Optional<float> repeat_length, Optional<float> rotation_angle = {}) { // A conservative guesstimate on how many colors we need to generate: auto max_dimension = max(physical_rect.width(), physical_rect.height()); auto max_visible_gradient = max(max_dimension / 2, min(size.width(), max_dimension)); GradientLine gradient_line(max_visible_gradient, color_stops, repeat_length); auto center_point = FloatPoint { center }.translated(0.5, 0.5); + AffineTransform rotation_transform; + if (rotation_angle.has_value()) { + auto angle_as_radians = rotation_angle.value() * (AK::Pi<float> / 180); + rotation_transform.rotate_radians(angle_as_radians); + } + return Gradient { move(gradient_line), [=](int x, int y) { // FIXME: See if there's a more efficient calculation we do there :^) auto point = FloatPoint(x, y) - center_point; + + if (rotation_angle.has_value()) + point.transform_by(rotation_transform); + auto gradient_x = point.x() / size.width(); auto gradient_y = point.y() / size.height(); return AK::sqrt(gradient_x * gradient_x + gradient_y * gradient_y) * max_visible_gradient; @@ -257,12 +267,13 @@ void Painter::fill_rect_with_conic_gradient(IntRect const& rect, ReadonlySpan<Co conic_gradient.paint(*this, a_rect); } -void Painter::fill_rect_with_radial_gradient(IntRect const& rect, ReadonlySpan<ColorStop> color_stops, IntPoint center, IntSize size, Optional<float> repeat_length) +void Painter::fill_rect_with_radial_gradient(IntRect const& rect, ReadonlySpan<ColorStop> color_stops, IntPoint center, IntSize size, Optional<float> repeat_length, Optional<float> rotation_angle) { auto a_rect = to_physical(rect); if (a_rect.intersected(clip_rect() * scale()).is_empty()) return; - auto radial_gradient = create_radial_gradient(a_rect, color_stops, center * scale(), size * scale(), repeat_length); + + auto radial_gradient = create_radial_gradient(a_rect, color_stops, center * scale(), size * scale(), repeat_length, rotation_angle); radial_gradient.paint(*this, a_rect); } diff --git a/Userland/Libraries/LibGfx/Painter.h b/Userland/Libraries/LibGfx/Painter.h index 6ae0016426..508bcac814 100644 --- a/Userland/Libraries/LibGfx/Painter.h +++ b/Userland/Libraries/LibGfx/Painter.h @@ -57,7 +57,7 @@ public: void fill_rect_with_gradient(IntRect const&, Color gradient_start, Color gradient_end); void fill_rect_with_linear_gradient(IntRect const&, ReadonlySpan<ColorStop>, float angle, Optional<float> repeat_length = {}); void fill_rect_with_conic_gradient(IntRect const&, ReadonlySpan<ColorStop>, IntPoint center, float start_angle, Optional<float> repeat_length = {}); - void fill_rect_with_radial_gradient(IntRect const&, ReadonlySpan<ColorStop>, IntPoint center, IntSize size, Optional<float> repeat_length = {}); + void fill_rect_with_radial_gradient(IntRect const&, ReadonlySpan<ColorStop>, IntPoint center, IntSize size, Optional<float> repeat_length = {}, Optional<float> rotation_angle = {}); 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_ellipse(IntRect const&, Color); |